diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-02-04 18:05:59 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-02-04 18:05:59 +0200 |
| commit | f37000aeb2b987c0fb14b6770fef69eaf274167a (patch) | |
| tree | af50afbb4fd52389a11ae8259d2f18ccd081ce61 /nt | |
| parent | d5f629d193ffe88c464379f02dd2adaadc9dfdf0 (diff) | |
| download | emacs-f37000aeb2b987c0fb14b6770fef69eaf274167a.tar.gz | |
Support (locale-info 'paper) on MS-Windows
* src/w32proc.c (LOCALE_IPAPERSIZE): Define if undefined.
(nl_langinfo): Support _NL_PAPER_WIDTH and _NL_PAPER_HEIGHT
like glibc does.
* src/fns.c (Flocale_info): Update the doc string.
* nt/inc/langinfo.h: Add _NL_PAPER_WIDTH and _NL_PAPER_HEIGHT
to the enumeration.
(_NL_PAPER_WIDTH, _NL_PAPER_HEIGHT): Define namesake macros.
* nt/mingw-cfg.site (emacs_cv_langinfo__nl_paper_width): Set
to 'yes'.
* doc/lispref/nonascii.texi (Locales): Update the
documentation of 'locale-info' for the argument of 'paper'.
* etc/NEWS: Update the locale-info entry.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/inc/langinfo.h | 4 | ||||
| -rw-r--r-- | nt/mingw-cfg.site | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h index fc69068969e..6c4959ecb54 100644 --- a/nt/inc/langinfo.h +++ b/nt/inc/langinfo.h @@ -27,6 +27,7 @@ enum { DAY_1, DAY_2, DAY_3, DAY_4, DAY_5, DAY_6, DAY_7, MON_1, MON_2, MON_3, MON_4, MON_5, MON_6, MON_7, MON_8, MON_9, MON_10, MON_11, MON_12, + _NL_PAPER_WIDTH, _NL_PAPER_HEIGHT, /* Number of enumerated values. */ _NL_NUM @@ -55,6 +56,9 @@ enum { #define MON_11 MON_11 #define MON_12 MON_12 +#define _NL_PAPER_WIDTH _NL_PAPER_WIDTH +#define _NL_PAPER_HEIGHT _NL_PAPER_HEIGHT + extern char *nl_langinfo (nl_item); #endif /* _LANGINFO_H */ diff --git a/nt/mingw-cfg.site b/nt/mingw-cfg.site index d9a824008cb..4df20494921 100644 --- a/nt/mingw-cfg.site +++ b/nt/mingw-cfg.site @@ -109,6 +109,7 @@ gl_cv_func_pthread_sigmask_return_works=yes gl_cv_func_pthread_sigmask_unblock_works="not relevant" # Implemented in w32proc.c emacs_cv_langinfo_codeset=yes +emacs_cv_langinfo__nl_paper_width=yes # Declared in ms-w32.h ac_cv_have_decl_alarm=yes # Avoid including the gnulib dup2 module |