* lisp/simple.el (eval-expression): Doc fix.

* etc/NEWS: Add missing entry.

diff --git a/etc/NEWS b/etc/NEWS
index bf26c669ea11ffe9fbc132be1498674e301df705..4c92c329872d8a38b31b2cc29886bb1828c487ad 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -221,6 +221,9 @@ equivalent to setting `(eval-expression-)print-length' and
 `(eval-expression-)print-level' to nil.  Additionally, it causes integers
 to be printed in other formats (octal, hexadecimal, and character).
 
+*** New hook `eval-expression-minibuffer-setup-hook' run by
+`eval-expression' on entering the minibuffer.
+
 ---
 ** `write-region-inhibit-fsync' now defaults to t in batch mode.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e11782d1102fa17b7e9fe08c2c1bbe46b25fee4..2a073a1ae325cadb1cfec52a8722d74c686382a6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2014-01-30  Glenn Morris  <rgm@gnu.org>
 
+       * simple.el (eval-expression): Doc fix.
+
        * hexl.el (hexl-mode-hook):
        * ielm.el (ielm-mode-hook):
        * emacs-lisp/lisp-mode.el (emacs-lisp-mode-hook)

diff --git a/lisp/simple.el b/lisp/simple.el
index 0aa32767295372bf1130a8032eeccc8b64ecf531..2e924c857da74e36da2fa28f1682f8fcf29906f2 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1401,6 +1401,9 @@ however, there is no such truncation.  Such a prefix argument
 also causes integers to be printed in several additional formats
 \(octal, hexadecimal, and character).
 
+Runs the hook `eval-expression-minibuffer-setup-hook' on entering the
+minibuffer.
+
 If `eval-expression-debug-on-error' is non-nil, which is the default,
 this command arranges for all errors to enter the debugger."
   (interactive