From: Glenn Morris <rgm@gnu.org>
Date: Fri, 12 Oct 2007 06:28:54 +0000 (+0000)
Subject: (command-line): Do not read abbrev file in batch mode.
X-Git-Tag: emacs-pretest-23.0.90~10402
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d5bd25585761a3d2247584923888c5a4381de12c;p=emacs.git

(command-line): Do not read abbrev file in batch mode.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 53fdbf3939d..51b12119956 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1017,11 +1017,9 @@ opening the first frame (e.g. open a connection to an X server).")
 	    (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))