summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2016-05-16 18:14:54 +0300
committerEli Zaretskii <eliz@gnu.org>2016-05-16 18:14:54 +0300
commit939eb753d521830cd931b45d72a745f1dd85ec09 (patch)
treefedfc6d3b46652286895222cdf62cb9a5505194d
parent6de0715f5467d4b925e2dfe082174529ace3b174 (diff)
downloademacs-939eb753d521830cd931b45d72a745f1dd85ec09.tar.gz
Fix bug in default setting of 'ps-paper-type'
* lisp/international/mule-cmds.el (set-locale-environment): Don't inherit the value of locale from previous examination of different environment variables, which didn't look at LC_PAPER, and so using that value would effectively ignore the setting of LC_PAPER. (Bug#23544)
-rw-r--r--lisp/international/mule-cmds.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 001aad14754..e7c7049cd0a 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -2733,8 +2733,8 @@ See also `locale-charset-language-names', `locale-language-names',
;; Default to A4 paper if we're not in a C, POSIX or US locale.
;; (See comments in Flocale_info.)
(unless frame
- (let ((locale locale)
- (paper (locale-info 'paper)))
+ (let ((paper (locale-info 'paper))
+ locale)
(if paper
;; This will always be null at the time of writing.
(cond