# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1172341759 0
# Node ID a909bafa108e5291142975692262b2cde7517280
# Parent  a228fbd9ee720355dadd5afd3e90a7bb142ad0ec
(command-line): Also check if the abbrev file is
readable.

diff -r a228fbd9ee72 -r a909bafa108e lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Feb 24 18:07:17 2007 +0000
+++ b/lisp/ChangeLog	Sat Feb 24 18:29:19 2007 +0000
@@ -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 -r a228fbd9ee72 -r a909bafa108e lisp/startup.el
--- a/lisp/startup.el	Sat Feb 24 18:07:17 2007 +0000
+++ b/lisp/startup.el	Sat Feb 24 18:29:19 2007 +0000
@@ -952,8 +952,12 @@
 	    (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