aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-01-29 23:48:06 -0800
committerGlenn Morris2014-01-29 23:48:06 -0800
commit6bbc0c845f910abcd8059c57476a6aa267138318 (patch)
tree18b7bf52f0561e3d5b9f1c1806f8b9fd13e1a5b7
parentad78f432005af4100fb6be5bb015393f77e1fdfe (diff)
downloademacs-6bbc0c845f910abcd8059c57476a6aa267138318.tar.gz
emacs-6bbc0c845f910abcd8059c57476a6aa267138318.zip
* lisp/simple.el (eval-expression): Doc fix.
* etc/NEWS: Add missing entry.
-rw-r--r--etc/NEWS3
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/simple.el3
3 files changed, 8 insertions, 0 deletions
diff --git a/etc/NEWS b/etc/NEWS
index bf26c669ea1..4c92c329872 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -221,6 +221,9 @@ equivalent to setting `(eval-expression-)print-length' and
221`(eval-expression-)print-level' to nil. Additionally, it causes integers 221`(eval-expression-)print-level' to nil. Additionally, it causes integers
222to be printed in other formats (octal, hexadecimal, and character). 222to be printed in other formats (octal, hexadecimal, and character).
223 223
224*** New hook `eval-expression-minibuffer-setup-hook' run by
225`eval-expression' on entering the minibuffer.
226
224--- 227---
225** `write-region-inhibit-fsync' now defaults to t in batch mode. 228** `write-region-inhibit-fsync' now defaults to t in batch mode.
226 229
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e11782d110..2a073a1ae32 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12014-01-30 Glenn Morris <rgm@gnu.org> 12014-01-30 Glenn Morris <rgm@gnu.org>
2 2
3 * simple.el (eval-expression): Doc fix.
4
3 * hexl.el (hexl-mode-hook): 5 * hexl.el (hexl-mode-hook):
4 * ielm.el (ielm-mode-hook): 6 * ielm.el (ielm-mode-hook):
5 * emacs-lisp/lisp-mode.el (emacs-lisp-mode-hook) 7 * emacs-lisp/lisp-mode.el (emacs-lisp-mode-hook)
diff --git a/lisp/simple.el b/lisp/simple.el
index 0aa32767295..2e924c857da 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1401,6 +1401,9 @@ however, there is no such truncation. Such a prefix argument
1401also causes integers to be printed in several additional formats 1401also causes integers to be printed in several additional formats
1402\(octal, hexadecimal, and character). 1402\(octal, hexadecimal, and character).
1403 1403
1404Runs the hook `eval-expression-minibuffer-setup-hook' on entering the
1405minibuffer.
1406
1404If `eval-expression-debug-on-error' is non-nil, which is the default, 1407If `eval-expression-debug-on-error' is non-nil, which is the default,
1405this command arranges for all errors to enter the debugger." 1408this command arranges for all errors to enter the debugger."
1406 (interactive 1409 (interactive