diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/loadup.el | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 42465ef1817..4d60e1da31d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2009-08-21 Dan Nicolaescu <dann@ics.uci.edu> + * 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 284c7e3a117..8f1fe845e39 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 |