diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-12-11 20:25:24 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-12-11 20:25:24 +0000 |
| commit | a2afff836c597fa2c7ef762d8a0558034305f019 (patch) | |
| tree | 729c0227d9bd6484899b931fc1e13c37e364fd62 /lisp/=custom.el | |
| parent | 7abfe9ba215f89d8b850d731190a620ba6e903db (diff) | |
| download | emacs-a2afff836c597fa2c7ef762d8a0558034305f019.tar.gz | |
Don't load .custom if -q was used.
Diffstat (limited to 'lisp/=custom.el')
| -rw-r--r-- | lisp/=custom.el | 5 |
1 files changed, 3 insertions, 2 deletions
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) |