# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1192170534 0
# Node ID 9f2eefd96d8ea21e778c78f14e194ac3c9837459
# Parent  14d97ccbec19a5415c86fbae5de3fe114d25dbbf
(command-line): Do not read abbrev file in batch mode.

diff -r 14d97ccbec19 -r 9f2eefd96d8e lisp/startup.el
--- 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))