From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 11 Dec 1996 20:25:24 +0000 (+0000)
Subject: Don't load .custom if -q was used.
X-Git-Tag: emacs-20.1~3277
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=79062c6c2fc05af1f00a043d3ea560fdd0abac5d;p=emacs.git

Don't load .custom if -q was used.
---

diff --git a/lisp/custom.el b/lisp/custom.el
index 910ef02b187..e747264583c 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -2463,8 +2463,9 @@ Face used for customization fields while they are being edited.")
 		     (not (string-match "XEmacs" emacs-version)))
 (custom-category-put 'custom-hidden-properties intangible t)
 
-(if (file-readable-p custom-file)
-    (load-file custom-file))
+(and init-file-user  ; Don't load any init file if -q was used.
+     (file-readable-p custom-file)
+     (load-file custom-file))
 
 (provide 'custom)