aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu <[email protected]>2009-08-21 06:19:23 +0000
committerDan Nicolaescu <[email protected]>2009-08-21 06:19:23 +0000
commitbcc5db2443c225d6c2d1c43a81db396679b053d5 (patch)
treee8484db9627dc66e8d96501de8ee50ca1d7ac5d4
parent1fb6109b7854e7f12aca2c4f1204163790f11c92 (diff)
Remove leftover macos code.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/loadup.el3
2 files changed, 2 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42465ef181..4d60e1da31 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
2009-08-21 Dan Nicolaescu <[email protected]>
+ * loadup.el: Remove leftover macos code.
+
* vc-git.el (vc-git-annotate-command): Run asynchronously.
Explicitly pass the date format to git blame so that user local
so that the output format can be parsed.
diff --git a/lisp/loadup.el b/lisp/loadup.el
index 284c7e3a11..8f1fe845e3 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -209,9 +209,6 @@
(load "term/pc-win")
(load "ls-lisp")
(load "disp-table"))) ; needed to setup ibm-pc char set, see internal.el
-(if (eq system-type 'macos)
- (progn
- (load "ls-lisp")))
(if (featurep 'ns)
(progn
(load "emacs-lisp/easymenu") ;; for platform-related menu adjustments