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

diff --git a/lisp/echistory.el b/lisp/echistory.el
index 66e0b08c52..3b4b8419bd 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -1,6 +1,6 @@
 ;;; echistory.el --- Electric Command History Mode
 
-;; Copyright (C) 1985 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
@@ -19,8 +19,10 @@
 
 ;; 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, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
 
 ;;; Code:
 
@@ -70,7 +72,7 @@ With prefix arg NOCONFIRM, execute current line as-is without editing."
   (define-key electric-history-map "\e<" 'beginning-of-buffer)
   (define-key electric-history-map "\n" 'next-line)
   (define-key electric-history-map "\r" 'next-line)
-  (define-key electric-history-map "\177" 'previous-line)  
+  (define-key electric-history-map "\177" 'previous-line)
   (define-key electric-history-map "\C-n" 'next-line)
   (define-key electric-history-map "\C-p" 'previous-line)
   (define-key electric-history-map "\ev" 'scroll-down)
@@ -113,9 +115,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)
@@ -126,7 +129,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)
@@ -147,4 +150,7 @@ The Command History listing is recomputed each time this mode is invoked."
       (progn (message "")
 	     (throw 'electric-history-quit nil))))
 
+(provide 'echistory)
+
+;;; arch-tag: 1e5018fe-190f-44a7-9109-a895dcac4c50
 ;;; echistory.el ends here