summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el1
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa427396c75..1f899700d46 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-21 Leo Liu <sdl.web@gmail.com>
+
+ * simple.el (read--expression): Don't enable eldoc-mode.
+
2014-01-20 Stefan Monnier <monnier@iro.umontreal.ca>
* simple.el (move-beginning-of-line): Make sure we don't move forward
diff --git a/lisp/simple.el b/lisp/simple.el
index 8e23b0804ca..aacd3ccf1ca 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1387,7 +1387,6 @@ display the result of expression evaluation."
(lambda ()
(add-hook 'completion-at-point-functions
#'lisp-completion-at-point nil t)
- (eldoc-mode 1)
(run-hooks 'eval-expression-minibuffer-setup-hook))
(read-from-minibuffer prompt initial-contents
read-expression-map t