(function-key-map): Use char-names more consistently.

(file-name-coding-system): Only set it for MacOS-9.  The other case is
already handled in mule-cmds.el (where it also works when mac-win.el
is not used).

2 files changed, 20 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b2113b8d0f4..68c6248c6fb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-21  Stefan  <monnier@iro.umontreal.ca>
+
+	* term/mac-win.el (function-key-map): Use char-names more consistently.
+	(file-name-coding-system): Only set it for MacOS-9.  The other case is
+	already handled in mule-cmds.el (where it also works when mac-win.el
+	is not used).
+
 2005-02-21  Kenichi Handa  <handa@m17n.org>
 
 	* international/mule.el (ctext-pre-write-conversion): Always use
@@ -11,7 +18,7 @@
 
 2005-02-20  Jonathan Yavner  <jyavner@member.fsf.org>
 
-	* ses.el (undo-more): restore defadvice, but only the part that
+	* ses.el (undo-more): Restore defadvice, but only the part that
 	allows changes outside the restricted area of the buffer.
 
 2005-02-20  Kim F. Storm  <storm@cua.dk>
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index a7ded41103e..d43264f275e 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1,6 +1,7 @@
 ;;; mac-win.el --- parse switches controlling interface with Mac window system
 
-;; Copyright (C) 1999, 2000, 2002, 2003, 2004  Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005
+;;   Free Software Foundation, Inc.
 
 ;; Author: Andrew Choi <akochoi@mac.com>
 ;; Keywords: terminals
@@ -1013,16 +1014,16 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
 (define-key function-key-map [M-return] [?\M-\C-m])
 (define-key function-key-map [tab] [?\t])
 (define-key function-key-map [M-tab] [?\M-\t])
-(define-key function-key-map [backspace] [127])
+(define-key function-key-map [backspace] [?\d])
 (define-key function-key-map [M-backspace] [?\M-\d])
 (define-key function-key-map [escape] [?\e])
 (define-key function-key-map [M-escape] [?\M-\e])
 
 ;; These tell read-char how to convert
 ;; these special chars to ASCII.
-(put 'return 'ascii-character 13)
+(put 'return 'ascii-character ?\C-m)
 (put 'tab 'ascii-character ?\t)
-(put 'backspace 'ascii-character 127)
+(put 'backspace 'ascii-character ?\d)
 (put 'escape 'ascii-character ?\e)
 
 
@@ -1667,7 +1668,7 @@ Switch to a buffer editing the last file dropped."
 
 (unless (eq system-type 'darwin)
   ;; This variable specifies the Unix program to call (as a process) to
-  ;; deteremine the amount of free space on a file system (defaults to
+  ;; determine the amount of free space on a file system (defaults to
   ;; df).  If it is not set to nil, ls-lisp will not work correctly
   ;; unless an external application df is implemented on the Mac.
   (setq directory-free-space-program nil)
@@ -1675,20 +1676,17 @@ Switch to a buffer editing the last file dropped."
   ;; Set this so that Emacs calls subprocesses with "sh" as shell to
   ;; expand filenames Note no subprocess for the shell is actually
   ;; started (see run_mac_command in sysdep.c).
-  (setq shell-file-name "sh"))
+  (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 (eq system-type 'darwin)
-    ;; On Darwin filenames are encoded in UTF-8
-    (setq file-name-coding-system 'utf-8)
-  ;; To display filenames in Chinese or Japanese, replace mac-roman with
-  ;; big5 or sjis
-  (setq file-name-coding-system 'mac-roman))
-
 ;; If Emacs is started from the Finder, change the default directory
 ;; to the user's home directory.
 (if (string= default-directory "/")
@@ -1706,5 +1704,5 @@ Switch to a buffer editing the last file dropped."
 
 ;; (prefer-coding-system 'mac-roman)
 
-;;; arch-tag: 71dfcd14-cde8-4d66-b05c-85ec94fb23a6
+;; arch-tag: 71dfcd14-cde8-4d66-b05c-85ec94fb23a6
 ;;; mac-win.el ends here