diff options
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 7e88b5f29e9..faa8a0f4a7f 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -653,6 +653,8 @@ opening the first frame (e.g. open a connection to an X server).") ;; Convert preloaded file names in load-history to absolute. (let ((simple-file-name + ;; Look for simple.el or simple.elc and use their directory + ;; as the place where all Lisp files live. (locate-file "simple" load-path (get-load-suffixes))) lisp-dir) ;; Don't abort if simple.el cannot be found, but print a warning. @@ -959,8 +961,12 @@ opening the first frame (e.g. open a connection to an X server).") (with-current-buffer (window-buffer) (deactivate-mark))) - ;; If the user has a file of abbrevs, read it. - (if (file-exists-p abbrev-file-name) + ;; If the user has a file of abbrevs, read it. + ;; FIXME: after the 22.0 release this should be changed so + ;; that it does not read the abbrev file when -batch is used + ;; on the command line. + (when (and (file-exists-p abbrev-file-name) + (file-readable-p abbrev-file-name)) (quietly-read-abbrev-file abbrev-file-name)) ;; If the abbrevs came entirely from the init file or the |