1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-30 19:53:09 +00:00

Merge from origin/emacs-25

939eb75 Fix bug in default setting of 'ps-paper-type'
This commit is contained in:
Paul Eggert 2016-05-26 12:41:37 -07:00
commit 745dd912e6

View File

@ -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