* term/mac-win.el: Remove load for ls-lisp.

* loadup.el: Load ls-lisp for system-type macos.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c08f8745f9892abb97511155845670ac817e4c9..c2a000e908d05e0f1f18aa10b440a6a5b793d5da 100644 (file)
--- 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 31a7cac8c9d494b40a2934ae2a3e06ee6dfd3ffc..48e46932775778dcabf74782d22622138ac92ed1 100644 (file)
--- 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 9164d162f622b81e375e73130891b9b9c89f4db7..8a55ff2a1397aecb75b4d191bb1c9bf420a1c0eb 100644 (file)
--- 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