From e9286904effac040c230b830964189e473c3f66c Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 15 Dec 1996 07:30:24 +0000 Subject: [PATCH] (cpp-edit-load): Don't load anything if init-file-user is nil. (cpp-edit-save): Doc fix. --- lisp/progmodes/cpp.el | 7 +++++-- 1 file 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 -- 2.39.5