aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2014-01-21 09:58:16 +0800
committerLeo Liu2014-01-21 09:58:16 +0800
commit87503791212088cdb1d8d5cd916df9d2a8be1999 (patch)
tree5a5f8573189bb2c39379484bb5d03182e751cfa8
parent2fb6d9c6d666f09d4d16c4b38f77518720b5f35e (diff)
downloademacs-87503791212088cdb1d8d5cd916df9d2a8be1999.tar.gz
emacs-87503791212088cdb1d8d5cd916df9d2a8be1999.zip
* simple.el (read--expression): Don't enable eldoc-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 @@
12014-01-21 Leo Liu <sdl.web@gmail.com>
2
3 * simple.el (read--expression): Don't enable eldoc-mode.
4
12014-01-20 Stefan Monnier <monnier@iro.umontreal.ca> 52014-01-20 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * simple.el (move-beginning-of-line): Make sure we don't move forward 7 * 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."
1387 (lambda () 1387 (lambda ()
1388 (add-hook 'completion-at-point-functions 1388 (add-hook 'completion-at-point-functions
1389 #'lisp-completion-at-point nil t) 1389 #'lisp-completion-at-point nil t)
1390 (eldoc-mode 1)
1391 (run-hooks 'eval-expression-minibuffer-setup-hook)) 1390 (run-hooks 'eval-expression-minibuffer-setup-hook))
1392 (read-from-minibuffer prompt initial-contents 1391 (read-from-minibuffer prompt initial-contents
1393 read-expression-map t 1392 read-expression-map t