diff options
| author | Richard M. Stallman <rms@gnu.org> | 1996-12-15 07:30:24 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1996-12-15 07:30:24 +0000 |
| commit | 71501cd042acd11e3e6ab7fa17bce3efbe3b1345 (patch) | |
| tree | 64f2dbb8d1adc0b25802e693cbaf660cd5a2aea5 /lisp/progmodes | |
| parent | 16d27a3abf1c90f9a63a895788ace4c6de958f7c (diff) | |
| download | emacs-71501cd042acd11e3e6ab7fa17bce3efbe3b1345.tar.gz | |
(cpp-edit-load): Don't load anything if init-file-user is nil.
(cpp-edit-save): Doc fix.
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/cpp.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el index 32573b6d0bc..fa0ed911e2e 100644 --- a/lisp/progmodes/cpp.el +++ b/lisp/progmodes/cpp.el @@ -510,7 +510,10 @@ You can also use the keyboard accelerators indicated like this: [K]ey." (defun cpp-edit-load () "Load cpp configuration." (interactive) - (cond ((file-readable-p cpp-config-file) + (cond ((null init-file-user) + ;; If -q was specified, don't load any init files. + nil) + ((file-readable-p cpp-config-file) (load-file cpp-config-file)) ((file-readable-p (concat "~/" cpp-config-file)) (load-file cpp-config-file))) @@ -518,7 +521,7 @@ You can also use the keyboard accelerators indicated like this: [K]ey." (cpp-edit-reset))) (defun cpp-edit-save () - "Load cpp configuration." + "Save the current cpp configuration in a file." (interactive) (require 'pp) (save-excursion |