3 files changed, 51 insertions, 45 deletions

diff --git a/lisp/faces.el b/lisp/faces.el
index e7940e209b9..03b3a769955 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1782,6 +1782,7 @@ created."
           ;; Make sure the kill and yank functions do not touch the X clipboard.
           (modify-frame-parameters frame '((interprogram-cut-function . nil)))
           (modify-frame-parameters frame '((interprogram-paste-function . nil)))
+          (set-locale-environment nil frame)
           (setq success t))
       (unless success
         (delete-frame frame)))
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 8af768f91cc..b0340c60794 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1741,7 +1741,7 @@ The default status is as follows:
 
 (reset-language-environment)
 
-(defun set-display-table-and-terminal-coding-system (language-name &optional coding-system)
+(defun set-display-table-and-terminal-coding-system (language-name &optional coding-system display)
   "Set up the display table and terminal coding system for LANGUAGE-NAME."
   (let ((coding (get-language-info language-name 'unibyte-display)))
     (if coding
@@ -1755,7 +1755,7 @@ The default status is as follows:
         (dotimes (i 128)
           (aset standard-display-table (+ i 128) nil))))
     (or (eq window-system 'pc)
-        (set-terminal-coding-system (or coding-system coding)))))
+        (set-terminal-coding-system (or coding-system coding) display))))
 
 (defun set-language-environment (language-name)
   "Set up multi-lingual environment for using LANGUAGE-NAME.
@@ -2349,7 +2349,7 @@ is returned.  Thus, for instance, if charset \"ISO8859-2\",
 ;; too, for setting things such as calendar holidays, ps-print paper
 ;; size, spelling dictionary.
 
-(defun set-locale-environment (&optional locale-name)
+(defun set-locale-environment (&optional locale-name display)
   "Set up multi-lingual environment for using LOCALE-NAME.
 This sets the language environment, the coding system priority,
 the default input method and sometimes other things.
@@ -2370,6 +2370,11 @@ directory named `/usr/share/locale' or `/usr/lib/locale'.  LOCALE-NAME
 will be translated according to the table specified by
 `locale-translation-file-name'.
 
+If DISPLAY is non-nil, only set the keyboard coding system and
+the terminal coding system for the given display, and don't touch
+session-global parameters like the language environment.  DISPLAY
+may be a display id or a frame.
+
 See also `locale-charset-language-names', `locale-language-names',
 `locale-preferred-coding-systems' and `locale-coding-system'."
   (interactive "sSet environment for locale: ")
@@ -2458,14 +2463,15 @@ See also `locale-charset-language-names', `locale-language-names',
 
           ;; Set up for this character set.  This is now the right way
           ;; to do it for both unibyte and multibyte modes.
-          (set-language-environment language-name)
+          (unless display
+            (set-language-environment language-name))
 
           ;; If default-enable-multibyte-characters is nil,
           ;; we are using single-byte characters,
           ;; so the display table and terminal coding system are irrelevant.
           (when default-enable-multibyte-characters
             (set-display-table-and-terminal-coding-system
-             language-name coding-system))
+             language-name coding-system display))
 
           ;; Set the `keyboard-coding-system' if appropriate (tty
           ;; only).  At least X and MS Windows can generate
@@ -2477,12 +2483,14 @@ See also `locale-charset-language-names', `locale-language-names',
           (let ((kcs (or coding-system
                          (car (get-language-info language-name
                                                  'coding-system)))))
-            (if kcs (set-keyboard-coding-system kcs)))
+            (if kcs (set-keyboard-coding-system kcs display)))
 
-          (setq locale-coding-system
-                (car (get-language-info language-name 'coding-priority))))
+          (unless display
+            (setq locale-coding-system
+                  (car (get-language-info language-name 'coding-priority)))))
 
-        (when (and coding-system
+        (when (and (not display)
+                   coding-system
                    (not (coding-system-equal coding-system
                                              locale-coding-system)))
           (prefer-coding-system coding-system)
@@ -2494,9 +2502,9 @@ See also `locale-charset-language-names', `locale-language-names',
     (when (boundp 'w32-ansi-code-page)
       (let ((code-page-coding (intern (format "cp%d" w32-ansi-code-page))))
         (when (coding-system-p code-page-coding)
-          (setq locale-coding-system code-page-coding)
-          (set-keyboard-coding-system code-page-coding)
-          (set-terminal-coding-system code-page-coding))))
+          (unless display (setq locale-coding-system code-page-coding))
+          (set-keyboard-coding-system code-page-coding display)
+          (set-terminal-coding-system code-page-coding display))))
 
     (when (eq system-type 'darwin)
       ;; On Darwin, file names are always encoded in utf-8, no matter
@@ -2511,32 +2519,33 @@ 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.)
-    (let ((locale locale)
-          (paper (locale-info 'paper)))
-      (if paper
-          ;; This will always be null at the time of writing.
-          (cond
-           ((equal paper '(216 279))
-            (setq ps-paper-type 'letter))
-           ((equal paper '(210 297))
-            (setq ps-paper-type 'a4)))
-        (let ((vars '("LC_ALL" "LC_PAPER" "LANG")))
-          (while (and vars (= 0 (length locale)))
-            (setq locale (getenv (pop vars)))))
-        (when locale
-          ;; As of glibc 2.2.5, these are the only US Letter locales,
-          ;; and the rest are A4.
-          (setq ps-paper-type
-                (or (locale-name-match locale '(("c$" . letter)
-                                                ("posix$" . letter)
-                                                (".._us" . letter)
-                                                (".._pr" . letter)
-                                                (".._ca" . letter)
-                                                ("enu$" . letter) ; Windows
-                                                ("esu$" . letter)
-                                                ("enc$" . letter)
-                                                ("frc$" . letter)))
-                    'a4))))))
+    (unless display
+      (let ((locale locale)
+            (paper (locale-info 'paper)))
+        (if paper
+            ;; This will always be null at the time of writing.
+            (cond
+             ((equal paper '(216 279))
+              (setq ps-paper-type 'letter))
+             ((equal paper '(210 297))
+              (setq ps-paper-type 'a4)))
+          (let ((vars '("LC_ALL" "LC_PAPER" "LANG")))
+            (while (and vars (= 0 (length locale)))
+              (setq locale (getenv (pop vars)))))
+          (when locale
+            ;; As of glibc 2.2.5, these are the only US Letter locales,
+            ;; and the rest are A4.
+            (setq ps-paper-type
+                  (or (locale-name-match locale '(("c$" . letter)
+                                                  ("posix$" . letter)
+                                                  (".._us" . letter)
+                                                  (".._pr" . letter)
+                                                  (".._ca" . letter)
+                                                  ("enu$" . letter) ; Windows
+                                                  ("esu$" . letter)
+                                                  ("enc$" . letter)
+                                                  ("frc$" . letter)))
+                      'a4)))))))
   nil)
 
 ;;; Charset property
diff --git a/lisp/server.el b/lisp/server.el
index b822eff0ae6..ef58306a9a5 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -651,10 +651,10 @@ The following commands are accepted by the client:
                     (setq request (substring request (match-end 0)))
                     (unless (server-client-get client 'version)
                       (error "Protocol error; make sure you use the correct version of emacsclient"))
-                    ;; Set up client's environment for tgetent(3)
-                    ;; according to ncurses(3).
                     (server-with-client-environment proc
-                        ("BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES"
+                        ("LANG" "LC_CTYPE" "LC_ALL"
+                         ;; For tgetent(3); list according to ncurses(3).
+                         "BAUDRATE" "COLUMNS" "ESCDELAY" "HOME" "LINES"
                          "NCURSES_ASSUMED_COLORS" "NCURSES_NO_PADDING"
                          "NCURSES_NO_SETBUF" "TERM" "TERMCAP" "TERMINFO"
                          "TERMINFO_DIRS" "TERMPATH")
@@ -665,10 +665,6 @@ The following commands are accepted by the client:
                     (server-client-set client 'tty (display-name frame))
                     (server-client-set client 'display (frame-display frame))
 
-                    ;; Set up display for the remote locale.
-                    ;; XXX This function has been removed from mule-cmds.el, we need to find another way.
-                    ;; (configure-display-for-locale)
-
                     ;; Reply with our pid.
                     (server-send-string proc (concat "-emacs-pid " (number-to-string (emacs-pid)) "\n"))
                     (setq dontkill t)))