remember.el (remember-mode-map): Define and initialize in one step.

2 files changed, 6 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 015ebd9f9d..10df4e1211 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -10,6 +10,7 @@
 	remember-buffer to emphasize that this does not have any
 	functional overlap with the `remember' function.
 	(remember-destroy): Remove autoload cookie.
+	(remember-mode-map): Define and initialize in one step.
 
 2007-11-01  Glenn Morris  <[email protected]>
 
diff --git a/lisp/textmodes/remember.el b/lisp/textmodes/remember.el
index e6274b2b56..9f8ad0aa9c 100644
--- a/lisp/textmodes/remember.el
+++ b/lisp/textmodes/remember.el
@@ -452,13 +452,12 @@ application."
 
 ;;; Internal Functions:
 
-(defvar remember-mode-map ()
+(defvar remember-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\C-x\C-s" 'remember-finalize)
+    (define-key map "\C-c\C-c" 'remember-finalize)
+    (define-key map "\C-c\C-k" 'remember-destroy))
   "Keymap used in Remember mode.")
-(when (not remember-mode-map)
-  (setq remember-mode-map (make-sparse-keymap))
-  (define-key remember-mode-map "\C-x\C-s" 'remember-finalize)
-  (define-key remember-mode-map "\C-c\C-c" 'remember-finalize)
-  (define-key remember-mode-map "\C-c\C-k" 'remember-destroy))
 
 (defun remember-mode ()
   "Major mode for output from \\[remember].