[Emacs-diffs] master 745dd91 1/9: Merge from origin/emacs-25

[Paul Eggert]

branch: master
commit 745dd912e628aff1ebcafa672dd16e99cb9db0ba
Merge: 8ff9c41 939eb75
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-25
    
    939eb75 Fix bug in default setting of 'ps-paper-type'
---
 lisp/international/mule-cmds.el |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index f2bb8e2..28eec4f 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