diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-26 12:41:37 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-26 12:41:37 -0700 |
| commit | 745dd912e628aff1ebcafa672dd16e99cb9db0ba (patch) | |
| tree | 1c47684deb7616fa66b3c202e66a035622841b0b /lisp/international | |
| parent | 8ff9c4109fd8ca239ce6af83d9dd3b124d2f0e3f (diff) | |
| parent | 939eb753d521830cd931b45d72a745f1dd85ec09 (diff) | |
| download | emacs-745dd912e628aff1ebcafa672dd16e99cb9db0ba.tar.gz | |
Merge from origin/emacs-25
939eb75 Fix bug in default setting of 'ps-paper-type'
Diffstat (limited to 'lisp/international')
| -rw-r--r-- | lisp/international/mule-cmds.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el index f2bb8e25695..28eec4f0df9 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 |