From d5bd25585761a3d2247584923888c5a4381de12c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 12 Oct 2007 06:28:54 +0000 Subject: [PATCH] (command-line): Do not read abbrev file in batch mode. --- lisp/startup.el | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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)) -- 2.39.5