summaryrefslogtreecommitdiff
path: root/lisp/progmodes/elisp-mode.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-07-07 09:27:44 -0700
committerGlenn Morris <rgm@gnu.org>2018-07-07 09:27:44 -0700
commitd3e0fdc24f85de3b33de007b8e1ca24560559d9b (patch)
tree751ecc26bd89a0b0d6b9b7a49f299c43fff0a445 /lisp/progmodes/elisp-mode.el
parent77166e0da2d58f2f6436989b7059d913be5b3439 (diff)
parenta427de9c86ed31b1fd7599664b3fea0733e633ee (diff)
downloademacs-d3e0fdc24f85de3b33de007b8e1ca24560559d9b.tar.gz
Merge from origin/emacs-26
a427de9 (origin/emacs-26) Fix bug #11732 3a04e15 Improve documentation of 'emacs-lock-mode' 9d6ca5a * lisp/imenu.el (imenu-generic-expression): Doc fix. (Bug#32... fdd7e7d Improve indexing of 'eval-defun' in ELisp manual 10af989 Fix (length CIRCULAR) documentation 271d1f7 Tramp editorials 4abf94f Clarify and improve doc strings of 'eval-last-sexp' and friends 6cfc7a7 Automate upload of Emacs manuals to gnu.org b73cde5 Fix MH-E mail composition with GNU Mailutils (SF#485) 0dce5e5 Speed up 'replace-buffer-contents' some more 00fdce0 * doc/emacs/docstyle.texi: Avoid messing up the html output. Conflicts: admin/make-tarball.txt
Diffstat (limited to 'lisp/progmodes/elisp-mode.el')
-rw-r--r--lisp/progmodes/elisp-mode.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 8eded03b9c4..58a58b46395 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -1191,11 +1191,11 @@ current buffer.
Normally, this function truncates long output according to the
value of the variables `eval-expression-print-length' and
`eval-expression-print-level'. With a prefix argument of zero,
-however, there is no such truncation. Such a prefix argument
-also causes integers to be printed in several additional formats
-\(octal, hexadecimal, and character when the prefix argument is
--1 or the integer is `eval-expression-print-maximum-character' or
-less).
+however, there is no such truncation.
+Integer values are printed in several formats (decimal, octal,
+and hexadecimal). When the prefix argument is -1 or the value
+doesn't exceed `eval-expression-print-maximum-character', an
+integer value is also printed as a character of that codepoint.
If `eval-expression-debug-on-error' is non-nil, which is the default,
this command arranges for all errors to enter the debugger."