*** empty log message ***

[gnu-emacs] / lisp / chistory.el

diff --git a/lisp/chistory.el b/lisp/chistory.el
index 29bc7b9b8d75da4c056e92aa0dd898a2fce1842c..dde30c75e0e6d6e5151c2614b39293a3b0fd00ab 100644 (file)
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -4,6 +4,7 @@
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
+;; Keywords: convenience
 
 ;; This file is part of GNU Emacs.
 
@@ -122,34 +123,42 @@ The buffer is left in Command History mode."
       (goto-char (point-min))
       (if (eobp)
          (error "No command history")
-       (Command-history-setup)))))
+       (command-history-mode)))))
 
-(defun Command-history-setup (&optional majormode modename keymap)
-  (set-buffer "*Command History*")
-  (use-local-map (or keymap command-history-map))
+(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))
+
+(defun command-history-mode ()
+  "Major mode for listing and repeating recent commands.
+
+Keybindings:
+\\{command-history-map}"
+  (interactive)
+  (Command-history-setup)
+  (setq major-mode 'command-history-mode)
+  (setq mode-name "Command History")
+  (use-local-map command-history-map)
+  (run-hooks 'command-history-mode-hook))
+
+(defun Command-history-setup ()
+  (kill-all-local-variables)
+  (use-local-map command-history-map)
   (lisp-mode-variables nil)
   (set-syntax-table emacs-lisp-mode-syntax-table)
-  (setq buffer-read-only t)
-  (use-local-map (or keymap command-history-map))
-  (setq major-mode (or majormode 'command-history-mode))
-  (setq mode-name (or modename "Command History")))
+  (setq buffer-read-only t))
 
 (defcustom command-history-hook nil
   "If non-nil, its value is called on entry to `command-history-mode'."
   :type 'hook
   :group 'chistory)
 
-(defvar command-history-map nil)
-(if command-history-map
-    nil
-  (setq command-history-map
-       (nconc (make-sparse-keymap) shared-lisp-mode-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))
-
 (defun command-history-repeat ()
   "Repeat the command shown on the current line.
 The buffer for that command is the previous current buffer."
@@ -163,8 +172,8 @@ The buffer for that command is the previous current buffer."
             (car (cdr (buffer-list))))))))
 
 ;;;###autoload
-(defun command-history-mode ()
-  "Major mode for examining commands from `command-history'.
+(defun command-history ()
+  "Examine commands from `command-history' in a buffer.
 The number of commands listed is controlled by `list-command-history-max'.
 The command history is filtered by `list-command-history-filter' if non-nil.
 Use \\<command-history-map>\\[command-history-repeat] to repeat the command on the current line.
@@ -172,8 +181,9 @@ Use \\<command-history-map>\\[command-history-repeat] to repeat the command on t
 Otherwise much like Emacs-Lisp Mode except that there is no self-insertion
 and digits provide prefix arguments.  Tab does not indent.
 \\{command-history-map}
-Calls the value of `command-history-hook' if that is non-nil.
-The Command History listing is recomputed each time this mode is invoked."
+
+This command always recompiles the Command History listing
+and runs the normal hook `command-history-hook'."
   (interactive)
   (list-command-history)
   (pop-to-buffer "*Command History*")
@@ -181,4 +191,5 @@ The Command History listing is recomputed each time this mode is invoked."
 
 (provide 'chistory)
 
+;;; arch-tag: c201a0cd-89f2-4d39-a532-4cb309391dbd
 ;;; chistory.el ends here