* 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)
;; 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