X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/26e06f4464c58704889bdc536edc25b73e8c0179..0ea47a6159f351f32b7dbc68debe99eb02f2dd8d:/lisp/echistory.el

diff --git a/lisp/echistory.el b/lisp/echistory.el
index 4264719231..644c5f485d 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -1,10 +1,9 @@
 ;;; echistory.el --- Electric Command History Mode
 
-;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 
 ;; This file is part of GNU Emacs.
 
@@ -28,14 +27,16 @@
 (require 'electric)			; command loop
 (require 'chistory)			; history lister
 
+;; Dynamically bound in electric-command-history
+(defvar electric-history-in-progress)
+
 ;;;###autoload
 (defun Electric-command-history-redo-expression (&optional noconfirm)
   "Edit current history line in minibuffer and execute result.
 With prefix arg NOCONFIRM, execute current line as-is without editing."
   (interactive "P")
   (let (todo)
-    (save-excursion
-      (set-buffer "*Command History*")
+    (with-current-buffer "*Command History*"
       (beginning-of-line)
       (setq todo (read (current-buffer)))
       (if (boundp 'electric-history-in-progress)
@@ -87,6 +88,8 @@ With prefix arg NOCONFIRM, execute current line as-is without editing."
 (defvar electric-command-history-hook nil
   "If non-nil, its value is called by `electric-command-history'.")
 
+(defvar Helper-return-blurb) ; from helper.el
+
 (defun electric-command-history ()
   "\\<electric-history-map>Major mode for examining and redoing commands from `command-history'.
 This pops up a window with the Command History listing.
@@ -114,7 +117,6 @@ 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)
 		    (setq major-mode 'electric-command-history)
 		    (setq mode-name "Electric History")
 		    (use-local-map electric-history-map))
@@ -151,5 +153,4 @@ The Command History listing is recomputed each time this mode is invoked."
 
 (provide 'echistory)
 
-;; arch-tag: 1e5018fe-190f-44a7-9109-a895dcac4c50
 ;;; echistory.el ends here