diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/loadup.el | 3 | ||||
| -rw-r--r-- | lisp/term/mac-win.el | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0c08f8745f9..c2a000e908d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2000-12-12 Andrew Choi <akochoi@i-cable.com> + + * term/mac-win.el: Remove load for ls-lisp. + + * loadup.el: Load ls-lisp for system-type macos. + 2000-12-12 Miles Bader <miles@gnu.org> * simple.el (delete-horizontal-space): Add BACKWARD-ONLY parameter. diff --git a/lisp/loadup.el b/lisp/loadup.el index 31a7cac8c9d..48e46932775 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -160,6 +160,9 @@ (load "international/ccl") ; for cpNNN coding systems in codepage.el (load "international/codepage") ; internal.el uses cpNNN coding systems (load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el +(if (eq system-type 'macos) + (progn + (load "ls-lisp"))) (if (fboundp 'atan) ; preload some constants and (progn ; floating pt. functions if we have float support. (load "float-sup"))) diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el index 9164d162f62..8a55ff2a139 100644 --- a/lisp/term/mac-win.el +++ b/lisp/term/mac-win.el @@ -100,16 +100,12 @@ ;; Don't have this yet. (fset 'x-get-resource 'ignore) -;; Use Lisp verison of ls instead of calling subprocess on ls (faster, -;; don't need to write ls). -(load "ls-lisp") - -(require 'dired) - ;; 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 |