Mercurial > emacs
changeset 85192:9f2eefd96d8e
(command-line): Do not read abbrev file in batch mode.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 12 Oct 2007 06:28:54 +0000 |
| parents | 14d97ccbec19 |
| children | 2922a5d23b4e |
| files | lisp/startup.el |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Fri Oct 12 06:28:31 2007 +0000 +++ b/lisp/startup.el Fri Oct 12 06:28:54 2007 +0000 @@ -1017,11 +1017,9 @@ (with-current-buffer (window-buffer) (deactivate-mark))) - ;; 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) + ;; If the user has a file of abbrevs, read it (unless -batch). + (when (and (not noninteractive) + (file-exists-p abbrev-file-name) (file-readable-p abbrev-file-name)) (quietly-read-abbrev-file abbrev-file-name))