[Emacs-diffs] Changes to emacs/lisp/chistory.el,v

[John Paul Wallington]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     John Paul Wallington <jpw>      08/06/27 17:50:28

Index: chistory.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/chistory.el,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- chistory.el 6 May 2008 07:57:27 -0000       1.26
+++ chistory.el 27 Jun 2008 17:50:28 -0000      1.27
@@ -109,8 +109,7 @@
          (buffer-read-only nil)
          (count (or list-command-history-max -1)))
       (while (and (/= count 0) history)
-       (if (and (boundp 'list-command-history-filter)
-                list-command-history-filter
+       (if (and (bound-and-true-p list-command-history-filter)
                 (funcall list-command-history-filter (car history)))
            nil
          (setq count (1- count))
@@ -124,15 +123,16 @@
          (error "No command history")
        (command-history-mode)))))
 
-(defvar command-history-map nil)
-(unless command-history-map
-  (setq command-history-map (make-sparse-keymap))
-  (set-keymap-parent command-history-map lisp-mode-shared-map)
-  (suppress-keymap command-history-map)
-  (define-key command-history-map "x" 'command-history-repeat)
-  (define-key command-history-map "\n" 'next-line)
-  (define-key command-history-map "\r" 'next-line)
-  (define-key command-history-map "\177" 'previous-line))
+(defvar command-history-map
+  (let ((map (make-sparse-keymap)))
+    (set-keymap-parent map lisp-mode-shared-map)
+    (suppress-keymap map)
+    (define-key map "x" 'command-history-repeat)
+    (define-key map "\n" 'next-line)
+    (define-key map "\r" 'next-line)
+    (define-key map "\177" 'previous-line)
+    map)
+  "Keymap for `command-history-mode'.")
 
 (defun command-history-mode ()
   "Major mode for listing and repeating recent commands.