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

diff --git a/lisp/startup.el b/lisp/startup.el
index 53fdbf3939d9d8d3aba73503d46faf1685eb5bdb..51b121199564778852a77a8b3483a41b0e788c53 100644 (file)
--- 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))