(command-line): Also check if the abbrev file is

readable.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed6d98ab6094757eb3164e5403776ce6ceb45571..a40ee053bcf65e364a9e42507c944f9b6f061f51 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-24  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * startup.el (command-line): Also check if the abbrev file is
+       readable.
+
 2007-02-24  John Paul Wallington  <jpw@pobox.com>
 
        * net/tls.el (tls-certtool-program): Fix custom type.

diff --git a/lisp/startup.el b/lisp/startup.el
index 76bec878338bae4d2fcb87dc3e4554e223d30cd2..3e26aa174091e9e66a4cd979cd989a8b48c9f734 100644 (file)
--- 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