Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-25

[gnu-emacs] / lisp / term / mac-win.el

diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 869a79e296664e02c58949518b0183b2eb35471d..53c4f55bd5ef1fc9d032da2975a1a61d8fb4df62 100644 (file)
--- 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)
 
 \f
@@ -1268,7 +1269,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)
@@ -1276,29 +1277,25 @@ 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 "/")
     (cd "~"))
 
-;; Tell Emacs to use pipes instead of pty's for processes because the
-;; latter sometimes lose characters.  Pty support is compiled in since
-;; ange-ftp will not work without it.
-(setq process-connection-type nil)
+;; Darwin 6- pty breakage is now controlled from the C code so that
+;; it applies to all builds on darwin.  See s/darwin.h PTY_ITERATION.
+;; (setq process-connection-type t)
 
 ;; Assume that fonts are always scalable on the Mac.  This sometimes
 ;; results in characters with jagged edges.  However, without it,
@@ -1308,5 +1305,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