From 610117a9d0573342a271aed9d67327d0c0a921a3 Mon Sep 17 00:00:00 2001
From: John Paul Wallington <jpw@pobox.com>
Date: Fri, 27 Jun 2008 17:51:24 +0000
Subject: [PATCH] (list-command-history): Use `bound-and-true-p'.
 (command-history-map): Define within defvar.  Add docstring.

---
 lisp/ChangeLog   |  7 ++++++-
 lisp/chistory.el | 22 +++++++++++-----------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f2a04ea7de..648d9875ad5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-27  John Paul Wallington  <jpw@pobox.com>
+
+	* chistory.el (list-command-history): Use `bound-and-true-p'.
+	(command-history-map): Define within defvar.  Add docstring.
+
 2008-06-27  Juanma Barranquero  <lekktu@gmail.com>
 
 	* image.el (image-jpeg-p): Don't fail if the arg cannot be converted
@@ -43,7 +48,7 @@
 2008-06-26  John Paul Wallington  <jpw@pobox.com>
 
 	* ibuf-ext.el (ibuffer-diff-buffer-with-file-1): New function.
-	(ibuffer-diff-with-file): Use it.  Do diff on marked buffers
+	(ibuffer-diff-with-file): Use it.  Do diff on marked buffers.
 	(ibuffer-mark-on-buffer): Don't display message when removing marks.
 	(ibuffer-mark-by-mode): Use `buffer-local-value'.
 
diff --git a/lisp/chistory.el b/lisp/chistory.el
index 47f5309cb44..21053950c9e 100644
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -109,8 +109,7 @@ The buffer is left in Command History mode."
 	  (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 @@ The buffer is left in Command History mode."
 	  (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.