mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-04 06:31:13 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-25

Browse source 
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
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/international/mule-cmds.el
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