X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/f9f9507e1d3202408b73b0c32a6e504502a70d5e..e1483c383115cc874a07ce2353567125ec36941f:/lisp/echistory.el

diff --git a/lisp/echistory.el b/lisp/echistory.el
index 1354650f17..8e04d7eb01 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -1,12 +1,15 @@
-;; Electric Command History Mode
+;;; echistory.el --- Electric Command History Mode
+
 ;; Copyright (C) 1985 Free Software Foundation, Inc.
-;; Principal author K. Shane Hartman
+
+;; Author: K. Shane Hartman
+;; Maintainer: FSF
 
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -15,9 +18,11 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
+;;; Code:
 
 (require 'electric)			; command loop
 (require 'chistory)			; history lister
@@ -38,10 +43,10 @@ With prefix arg NOCONFIRM, execute current line as-is without editing."
 (defvar electric-history-map ())
 (if electric-history-map
     ()
-  (setq electric-history-map (make-keymap))
-  (fillarray electric-history-map 'Electric-history-undefined)
-  (define-key electric-history-map "\e" (make-keymap))
-  (fillarray (lookup-key electric-history-map "\e") 'Electric-history-undefined)
+  (setq electric-history-map (make-sparse-keymap))
+  (define-key electric-history-map [t] 'Electric-history-undefined)
+  (define-key electric-history-map "\e" (make-sparse-keymap))
+  (define-key electric-history-map [?\e t] 'Electric-history-undefined)
   (define-key electric-history-map "\C-u" 'universal-argument)
   (define-key electric-history-map " " 'Electric-command-history-redo-expression)
   (define-key electric-history-map "!" 'Electric-command-history-redo-expression)
@@ -59,7 +64,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing."
   (define-key electric-history-map "\C-c\C-c" 'Electric-history-quit)
   (define-key electric-history-map "\C-]" 'Electric-history-quit)
   (define-key electric-history-map "\C-z" 'suspend-emacs)
-  (define-key electric-history-map "\C-h" 'Helper-help)
+  (define-key electric-history-map (char-to-string help-char) 'Helper-help)
   (define-key electric-history-map "?" 'Helper-describe-bindings)
   (define-key electric-history-map "\e>" 'end-of-buffer)
   (define-key electric-history-map "\e<" 'beginning-of-buffer)
@@ -70,6 +75,11 @@ With prefix arg NOCONFIRM, execute current line as-is without editing."
   (define-key electric-history-map "\C-p" 'previous-line)
   (define-key electric-history-map "\ev" 'scroll-down)
   (define-key electric-history-map "\C-v" 'scroll-up)
+  (define-key electric-history-map [home] 'beginning-of-buffer)
+  (define-key electric-history-map [down] 'next-line)
+  (define-key electric-history-map [up] 'previous-line)
+  (define-key electric-history-map [prior] 'scroll-down)
+  (define-key electric-history-map [next] 'scroll-up)
   (define-key electric-history-map "\C-l" 'recenter)
   (define-key electric-history-map "\e\C-v" 'scroll-other-window))
 
@@ -103,9 +113,10 @@ The Command History listing is recomputed each time this mode is invoked."
 		  (save-window-excursion
 		    (list-command-history)
 		    (set-buffer "*Command History*")
-		    (Command-history-setup 'electric-command-history
-					   "Electric History"
-					   electric-history-map))
+		    (Command-history-setup)
+		    (setq major-mode 'electric-command-history)
+		    (setq mode-name "Electric History")
+		    (use-local-map electric-history-map))
 		  (Electric-pop-up-window "*Command History*")
 		  (run-hooks 'electric-command-history-hook)
 		  (if (eobp)
@@ -116,7 +127,7 @@ The Command History listing is recomputed each time this mode is invoked."
 		      (Electric-command-loop 'electric-history-quit
 					     "->" t))))))
       (set-buffer "*Command History*")
-      (Command-history-setup)
+      (command-history-mode)
       (bury-buffer (current-buffer)))
     (if (consp todo)
 	(progn (set-buffer old-buffer)
@@ -127,7 +138,7 @@ The Command History listing is recomputed each time this mode is invoked."
 (defun Electric-history-undefined ()
   (interactive)
   (ding)
-  (message "Type C-h for help, ? for commands, C-c to quit, Space to execute")
+  (message (substitute-command-keys "Type \\[Helper-help] for help, ? for commands, C-c C-c to quit, Space to execute"))
   (sit-for 4))
 
 (defun Electric-history-quit ()
@@ -136,3 +147,7 @@ The Command History listing is recomputed each time this mode is invoked."
   (if (boundp 'electric-history-in-progress)
       (progn (message "")
 	     (throw 'electric-history-quit nil))))
+
+(provide 'echistory)
+
+;;; echistory.el ends here