diff options
| author | Richard M. Stallman | 1996-12-11 20:25:24 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1996-12-11 20:25:24 +0000 |
| commit | 79062c6c2fc05af1f00a043d3ea560fdd0abac5d (patch) | |
| tree | 5062f49528bcc440d89e849c72e9e6c6de9bd448 /lisp | |
| parent | 7bb250daccf05f8f4ba387e89dc10a0da4d7c2ed (diff) | |
| download | emacs-79062c6c2fc05af1f00a043d3ea560fdd0abac5d.tar.gz emacs-79062c6c2fc05af1f00a043d3ea560fdd0abac5d.zip | |
Don't load .custom if -q was used.
Diffstat (limited to 'lisp')
| -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.") | |||
| 2463 | (not (string-match "XEmacs" emacs-version))) | 2463 | (not (string-match "XEmacs" emacs-version))) |
| 2464 | (custom-category-put 'custom-hidden-properties intangible t) | 2464 | (custom-category-put 'custom-hidden-properties intangible t) |
| 2465 | 2465 | ||
| 2466 | (if (file-readable-p custom-file) | 2466 | (and init-file-user ; Don't load any init file if -q was used. |
| 2467 | (load-file custom-file)) | 2467 | (file-readable-p custom-file) |
| 2468 | (load-file custom-file)) | ||
| 2468 | 2469 | ||
| 2469 | (provide 'custom) | 2470 | (provide 'custom) |
| 2470 | 2471 | ||