[Emacs-diffs] Changes to emacs/lisp/term/mac-win.el

[YAMAMOTO Mitsuharu]

Index: emacs/lisp/term/mac-win.el
diff -c emacs/lisp/term/mac-win.el:1.38 emacs/lisp/term/mac-win.el:1.39
*** emacs/lisp/term/mac-win.el:1.38     Tue Apr 12 10:27:29 2005
--- emacs/lisp/term/mac-win.el  Thu Apr 14 09:28:21 2005
***************
*** 1085,1091 ****
  (put 'escape 'ascii-character ?\e)
  
  
! ;;;; Keyboard layout/language change events
  (defconst mac-script-code-coding-systems
    '((0 . mac-roman)                   ; smRoman
      (1 . japanese-shift-jis)          ; smJapanese
--- 1085,1091 ----
  (put 'escape 'ascii-character ?\e)
  
  
! ;;;; Script codes and coding systems
  (defconst mac-script-code-coding-systems
    '((0 . mac-roman)                   ; smRoman
      (1 . japanese-shift-jis)          ; smJapanese
***************
*** 1097,1102 ****
--- 1097,1111 ----
      )
    "Alist of Mac script codes vs Emacs coding systems.")
  
+ (defconst mac-system-coding-system
+   (let ((base (or (cdr (assq mac-system-script-code
+                            mac-script-code-coding-systems))
+                 'mac-roman)))
+     (if (eq system-type 'darwin)
+       base
+       (coding-system-change-eol-conversion base 'mac)))
+   "Coding system derived from the system script code.")
+ 
  ;;;; Keyboard layout/language change events
  (defun mac-handle-language-change (event)
    (interactive "e")
***************
*** 1739,1752 ****
    ;; started (see run_mac_command in sysdep.c).
    (setq shell-file-name "sh")
  
!   ;; To display filenames in Chinese or Japanese, replace mac-roman with
!   ;; big5 or sjis
!   (setq file-name-coding-system 'mac-roman))
! 
! ;; X Window emulation in macterm.c is not complete enough to start a
! ;; frame without a minibuffer properly.  Call this to tell ediff
! ;; library to use a single frame.
! ; (ediff-toggle-multiframe)
  
  ;; If Emacs is started from the Finder, change the default directory
  ;; to the user's home directory.
--- 1748,1758 ----
    ;; started (see run_mac_command in sysdep.c).
    (setq shell-file-name "sh")
  
!   ;; Some system variables are encoded with the system script code.
!   (dolist (v '(system-name
!              emacs-build-system       ; Mac OS 9 version cannot dump
!              user-login-name user-real-login-name user-full-name))
!     (set v (decode-coding-string (symbol-value v) mac-system-coding-system))))
  
  ;; If Emacs is started from the Finder, change the default directory
  ;; to the user's home directory.
***************
*** 1763,1769 ****
  ;; or bold bitmap versions will not display these variants correctly.
  (setq scalable-fonts-allowed t)
  
- ;; (prefer-coding-system 'mac-roman)
- 
  ;; arch-tag: 71dfcd14-cde8-4d66-b05c-85ec94fb23a6
  ;;; mac-win.el ends here
--- 1769,1773 ----