aboutsummaryrefslogtreecommitdiffstats
path: root/src/fns.c
diff options
context:
space:
mode:
authorEli Zaretskii2019-02-04 18:05:59 +0200
committerEli Zaretskii2019-02-04 18:05:59 +0200
commitf37000aeb2b987c0fb14b6770fef69eaf274167a (patch)
treeaf50afbb4fd52389a11ae8259d2f18ccd081ce61 /src/fns.c
parentd5f629d193ffe88c464379f02dd2adaadc9dfdf0 (diff)
downloademacs-f37000aeb2b987c0fb14b6770fef69eaf274167a.tar.gz
emacs-f37000aeb2b987c0fb14b6770fef69eaf274167a.zip
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 'src/fns.c')
-rw-r--r--src/fns.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fns.c b/src/fns.c
index a7279b13552..95bafae6c4c 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3100,8 +3100,9 @@ ITEM should be one of the following:
3100 3100
3101`months', returning a 12-element vector of month names (locale items MON_n); 3101`months', returning a 12-element vector of month names (locale items MON_n);
3102 3102
3103`paper', returning a list (WIDTH HEIGHT) for the default paper size, 3103`paper', returning a list of 2 integers (WIDTH HEIGHT) for the default
3104 both measured in millimeters (locale items PAPER_WIDTH, PAPER_HEIGHT). 3104 paper size, both measured in millimeters (locale items _NL_PAPER_WIDTH,
3105 _NL_PAPER_HEIGHT).
3105 3106
3106If the system can't provide such information through a call to 3107If the system can't provide such information through a call to
3107`nl_langinfo', or if ITEM isn't from the list above, return nil. 3108`nl_langinfo', or if ITEM isn't from the list above, return nil.