Merge from emacs-23; up to 2010-06-12T08:59:37Z!albinus@detlef.

[gnu-emacs] / lisp / echistory.el

diff --git a/lisp/echistory.el b/lisp/echistory.el
index 1d2c5d8a388501eb847f28ee9dd83129bee2c261..d5ee3003d68ee098d3be1af40eb7df5f42e9ffd7 100644 (file)
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -27,6 +27,9 @@
 (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.
@@ -85,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.