[Emacs-diffs] Changes to emacs/lisp/international/mule-cmds.el

[Stefan Monnier]

Index: emacs/lisp/international/mule-cmds.el
diff -c emacs/lisp/international/mule-cmds.el:1.266 
emacs/lisp/international/mule-cmds.el:1.267
*** emacs/lisp/international/mule-cmds.el:1.266 Tue Mar 15 02:32:23 2005
--- emacs/lisp/international/mule-cmds.el       Fri Mar 25 15:41:42 2005
***************
*** 1734,1740 ****
  
  (reset-language-environment)
  
! (defun set-display-table-and-terminal-coding-system (language-name)
    "Set up the display table and terminal coding system for LANGUAGE-NAME."
    (let ((coding (get-language-info language-name 'unibyte-display)))
      (if coding
--- 1734,1740 ----
  
  (reset-language-environment)
  
! (defun set-display-table-and-terminal-coding-system (language-name &optional 
coding-system)
    "Set up the display table and terminal coding system for LANGUAGE-NAME."
    (let ((coding (get-language-info language-name 'unibyte-display)))
      (if coding
***************
*** 1748,1754 ****
        (dotimes (i 128)
          (aset standard-display-table (+ i 128) nil))))
      (or (eq window-system 'pc)
!       (set-terminal-coding-system coding))))
  
  (defun set-language-environment (language-name)
    "Set up multi-lingual environment for using LANGUAGE-NAME.
--- 1748,1754 ----
        (dotimes (i 128)
          (aset standard-display-table (+ i 128) nil))))
      (or (eq window-system 'pc)
!       (set-terminal-coding-system (or coding-system coding)))))
  
  (defun set-language-environment (language-name)
    "Set up multi-lingual environment for using LANGUAGE-NAME.
***************
*** 2446,2452 ****
          ;; 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))
  
          ;; Set the `keyboard-coding-system' if appropriate (tty
          ;; only).  At least X and MS Windows can generate
--- 2446,2453 ----
          ;; 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))
  
          ;; Set the `keyboard-coding-system' if appropriate (tty
          ;; only).  At least X and MS Windows can generate
***************
*** 2476,2484 ****
          (set-keyboard-coding-system code-page-coding)
          (set-terminal-coding-system code-page-coding))))
  
-     ;; On Darwin, file names are always encoded in utf-8, no matter the 
locale.
      (when (eq system-type 'darwin)
!       (setq default-file-name-coding-system 'utf-8))
  
      ;; Default to A4 paper if we're not in a C, POSIX or US locale.
      ;; (See comments in Flocale_info.)
--- 2477,2492 ----
          (set-keyboard-coding-system code-page-coding)
          (set-terminal-coding-system code-page-coding))))
  
      (when (eq system-type 'darwin)
!       ;; On Darwin, file names are always encoded in utf-8, no matter
!       ;; the locale.
!       (setq default-file-name-coding-system 'utf-8)
!       ;; Mac OS X's Terminal.app by default uses utf-8 regardless of
!       ;; the locale.
!       (when (and (null window-system)
!                (equal (getenv "TERM_PROGRAM") "Apple_Terminal"))
!       (set-terminal-coding-system 'utf-8)
!       (set-keyboard-coding-system 'utf-8)))
  
      ;; Default to A4 paper if we're not in a C, POSIX or US locale.
      ;; (See comments in Flocale_info.)