aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref
diff options
context:
space:
mode:
authorEli Zaretskii2019-02-04 18:05:59 +0200
committerEli Zaretskii2019-02-04 18:05:59 +0200
commitf37000aeb2b987c0fb14b6770fef69eaf274167a (patch)
treeaf50afbb4fd52389a11ae8259d2f18ccd081ce61 /doc/lispref
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 'doc/lispref')
-rw-r--r--doc/lispref/nonascii.texi6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 56d96cff328..ae9a8ab6323 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -2115,9 +2115,9 @@ Return a 12-element vector of month names (locale items @code{MON_1}
2115through @code{MON_12}). 2115through @code{MON_12}).
2116 2116
2117@item paper 2117@item paper
2118Return a list @code{(@var{width} @var{height})} for the default paper 2118Return a list @w{@code{(@var{width} @var{height})}} of 2 integers, for
2119size measured in millimeters (locale items @code{PAPER_WIDTH} and 2119the default paper size measured in millimeters (locale items
2120@code{PAPER_HEIGHT}). 2120@code{_NL_PAPER_WIDTH} and @code{_NL_PAPER_HEIGHT}).
2121@end table 2121@end table
2122 2122
2123If the system can't provide the requested information, or if 2123If the system can't provide the requested information, or if