From: Dan Nicolaescu Date: Sat, 24 Feb 2007 18:29:19 +0000 (+0000) Subject: (command-line): Also check if the abbrev file is X-Git-Tag: emacs-pretest-22.0.95~131 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2863a9be6a14eefe1f7549b99932684bdb8f73e5;p=emacs.git (command-line): Also check if the abbrev file is readable. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ed6d98ab609..a40ee053bcf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-02-24 Dan Nicolaescu + + * startup.el (command-line): Also check if the abbrev file is + readable. + 2007-02-24 John Paul Wallington * net/tls.el (tls-certtool-program): Fix custom type. diff --git a/lisp/startup.el b/lisp/startup.el index 76bec878338..3e26aa17409 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -952,8 +952,12 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." (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