HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dynwind fixes
[bpt/emacs.git]
/
lisp
/
echistory.el
diff --git
a/lisp/echistory.el
b/lisp/echistory.el
index
3c0a4a0
..
906d8a9
100644
(file)
--- a/
lisp/echistory.el
+++ b/
lisp/echistory.el
@@
-1,10
+1,9
@@
;;; echistory.el --- Electric Command History Mode
;;; echistory.el --- Electric Command History Mode
-;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2014 Free Software Foundation, Inc.
;; Author: K. Shane Hartman
;; Author: K. Shane Hartman
-;; Maintainer:
FSF
+;; Maintainer:
emacs-devel@gnu.org
;; This file is part of GNU Emacs.
;; This file is part of GNU Emacs.
@@
-28,6
+27,9
@@
(require 'electric) ; command loop
(require 'chistory) ; history lister
(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.
;;;###autoload
(defun Electric-command-history-redo-expression (&optional noconfirm)
"Edit current history line in minibuffer and execute result.
@@
-86,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 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.
(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.
@@
-113,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*")
(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))
(setq major-mode 'electric-command-history)
(setq mode-name "Electric History")
(use-local-map electric-history-map))