Mercurial > emacs

changeset 98447:8df3a4ab1adc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(set-language-environment-nonascii-translation): Fix nonascii value for `pc' ``window-system''. (set-display-table-and-terminal-coding-system, set-default-coding-systems): Don't special-case `pc'.
author Eli Zaretskii <eliz@gnu.org>
date Wed, 01 Oct 2008 16:17:02 +0000
parents 94320fde46fe
children b8945a3b9fd5
files lisp/international/mule-cmds.el
diffstat 1 files changed, 4 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/international/mule-cmds.el	Wed Oct 01 12:37:28 2008 +0000
+++ b/lisp/international/mule-cmds.el	Wed Oct 01 16:17:02 2008 +0000
@@ -344,10 +344,7 @@
 	     (or (not coding-system)
 		 (coding-system-get coding-system 'ascii-compatible-p)))
 	(setq default-file-name-coding-system coding-system)))
-  ;; If coding-system is nil, honor that on MS-DOS as well, so
-  ;; that they could reset the terminal coding system.
-  (unless (and (eq window-system 'pc) coding-system)
-    (setq default-terminal-coding-system coding-system))
+  (setq default-terminal-coding-system coding-system)
   (setq default-keyboard-coding-system coding-system)
   ;; Preserve eol-type from existing default-process-coding-systems.
   ;; On non-unix-like systems in particular, these may have been set
@@ -1789,13 +1786,11 @@
       ;; The following 2 lines undo the 8-bit display that we set up
       ;; in standard-display-european-internal, which see.  This is in
       ;; case the user has used standard-display-european earlier in
-      ;; this session.  (The MS-DOS port doesn't use that setup, so it
-      ;; doesn't need to undo it.)
+      ;; this session.
       (when standard-display-table
 	(dotimes (i 128)
 	  (aset standard-display-table (+ i 128) nil))))
-    (or (eq window-system 'pc)
-	(set-terminal-coding-system (or coding-system coding) display))))
+    (set-terminal-coding-system (or coding-system coding) display)))
 
 (defun set-language-environment (language-name)
   "Set up multi-lingual environment for using LANGUAGE-NAME.
@@ -1967,7 +1962,7 @@
   ;; defined.
   (let ((nonascii (get-language-info language-name 'nonascii-translation)))
     (if (eq window-system 'pc)
-	(setq nonascii (intern "cp%d" dos-codepage)))
+	(setq nonascii (intern (format "cp%d" dos-codepage))))
     (or (and (charsetp nonascii)
 	     (get-charset-property nonascii :ascii-compatible-p))
 	(setq nonascii 'iso-8859-1))