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

[Andreas Schwab]

Index: emacs/lisp/term/mac-win.el
diff -c emacs/lisp/term/mac-win.el:1.9 emacs/lisp/term/mac-win.el:1.10
*** emacs/lisp/term/mac-win.el:1.9      Sun Jun 16 19:08:56 2002
--- emacs/lisp/term/mac-win.el  Sat Jun 29 15:01:32 2002
***************
*** 1,6 ****
  ;;; mac-win.el --- support for "Macintosh windows"
  
! ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
  
  ;; Author: Andrew Choi <address@hidden>
  
--- 1,6 ----
  ;;; mac-win.el --- support for "Macintosh windows"
  
! ;; Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
  
  ;; Author: Andrew Choi <address@hidden>
  
***************
*** 104,121 ****
  ;; Don't have this yet.
  (fset 'x-get-resource 'ignore)
  
! ;; This variable specifies the Unix program to call (as a process) to
! ;; deteremine 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.
! (require 'dired)
! 
! (setq dired-free-space-program nil)
! 
! ;; 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")
  
  ;; X Window emulation in macterm.c is not complete enough to start a
  ;; frame without a minibuffer properly.  Call this to tell ediff
--- 104,123 ----
  ;; Don't have this yet.
  (fset 'x-get-resource 'ignore)
  
! (if (eq system-type 'darwin)
!     ;; df on Darwin does not understand -P
!     (setq directory-free-space-args "-k")
! 
!   ;; This variable specifies the Unix program to call (as a process) to
!   ;; deteremine 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)
! 
!   ;; 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"))
  
  ;; X Window emulation in macterm.c is not complete enough to start a
  ;; frame without a minibuffer properly.  Call this to tell ediff
***************
*** 211,229 ****
                (set-fontset-font "fontset-mac" key monaco-font))))
         (get 'mac-roman-encoder 'translation-table)))))
  
! ;; 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)
  
  ;; Assume that fonts are always scalable on the Mac.  This sometimes
  ;; results in characters with jagged edges.  However, without it,
--- 213,235 ----
                (set-fontset-font "fontset-mac" key monaco-font))))
         (get 'mac-roman-encoder 'translation-table)))))
  
! (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 "~"))
  
! (unless (eq system-type 'darwin)
!   ;; 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))
  
  ;; Assume that fonts are always scalable on the Mac.  This sometimes
  ;; results in characters with jagged edges.  However, without it,