aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el2
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3966debad8b..aff58b8da21 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12011-01-20 Glenn Morris <rgm@gnu.org>
2
3 * simple.el (read-expression-history): Remove, it's in minibuf.c.
4
12011-01-20 Chong Yidong <cyd@stupidchicken.com> 52011-01-20 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * subr.el (y-or-n-p): Revert 2011-01-07 change, removing ARGS. 7 * subr.el (y-or-n-p): Revert 2011-01-07 change, removing ARGS.
diff --git a/lisp/simple.el b/lisp/simple.el
index 78ba99a5bfd..476d5ab518d 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1142,8 +1142,6 @@ in *Help* buffer. See also the command `describe-char'."
1142 (set-keymap-parent m minibuffer-local-map) 1142 (set-keymap-parent m minibuffer-local-map)
1143 (setq read-expression-map m)) 1143 (setq read-expression-map m))
1144 1144
1145(defvar read-expression-history nil)
1146
1147(defvar minibuffer-completing-symbol nil 1145(defvar minibuffer-completing-symbol nil
1148 "Non-nil means completing a Lisp symbol in the minibuffer.") 1146 "Non-nil means completing a Lisp symbol in the minibuffer.")
1149 1147