Mercurial > emacs
changeset 76127:a909bafa108e
(command-line): Also check if the abbrev file is
readable.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sat, 24 Feb 2007 18:29:19 +0000 |
| parents | a228fbd9ee72 |
| children | 120cf32525c1 |
| files | lisp/ChangeLog lisp/startup.el |
| diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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