Mercurial > emacs

--- a/lisp/ChangeLog	Tue Dec 12 04:54:02 2000 +0000
+++ b/lisp/ChangeLog	Tue Dec 12 05:04:07 2000 +0000
@@ -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.
--- a/lisp/loadup.el	Tue Dec 12 04:54:02 2000 +0000
+++ b/lisp/loadup.el	Tue Dec 12 05:04:07 2000 +0000
@@ -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")))
--- a/lisp/term/mac-win.el	Tue Dec 12 04:54:02 2000 +0000
+++ b/lisp/term/mac-win.el	Tue Dec 12 05:04:07 2000 +0000
@@ -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