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

diff --git a/lisp/echistory.el b/lisp/echistory.el
index 9b356e60d5..8e04d7eb01 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -18,8 +18,9 @@
 ;; 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:
 
@@ -112,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)
@@ -125,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)
@@ -136,7 +138,7 @@ The Command History listing is recomputed each time this mode is invoked."
 (defun Electric-history-undefined ()
   (interactive)
   (ding)
-  (message (substitute-command-keys "Type \\[Help-for-help] 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 ()
@@ -146,4 +148,6 @@ The Command History listing is recomputed each time this mode is invoked."
       (progn (message "")
 	     (throw 'electric-history-quit nil))))
 
+(provide 'echistory)
+
 ;;; echistory.el ends here