(define-obsolete-function-alias): New macro.

[bpt/emacs.git] / lisp / echistory.el

diff --git a/lisp/echistory.el b/lisp/echistory.el
index 9b356e6..a01cad8 100644 (file)
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -18,8 +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.
+
+;;; Commentary:
 
 ;;; Code:
 
@@ -69,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)
@@ -112,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)
@@ -125,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)
@@ -136,7 +140,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 +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