*** empty log message ***

1 files changed, 6 insertions, 3 deletions

diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index d54cc0b51e0..a637385c349 100644
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -30,8 +30,10 @@
 ;;
 ;;   '(progn
 ;;      (define-key c-mode-map "\C-c\C-x" 'cpp-parse-buffer)
-;;      (define-key-after (bar (lookup-key c-mode-map [ menu-bar c ]))
-;;        [ cpp-parse ] '("Parse Conditionals" . cpp-parse-buffer) 'up)))
+;;      (define-key-after (lookup-key c-mode-map [ menu-bar c ])
+;;        [ cpp-parse ] '("Parse Conditionals" . cpp-parse-buffer) 'up))
+
+;; This package is inspired by Jim Coplien's delta editor for SCCS.
 
 ;;; Todo:
 
@@ -438,7 +440,8 @@ You can also use the keyboard accelerators indicated like this: [K]ey."
 	 (load-file ".cpp.el"))
 	((file-readable-p "~/.cpp.el")
 	 (load-file ".cpp.el")))
-  (cpp-edit-reset))
+  (if (eq major-mode 'cpp-edit-mode)
+      (cpp-edit-reset)))
 
 (defun cpp-edit-save ()
   "Load cpp configuration."