From 1670e27f383c96eb19bb2049c760a8bd5d2eec12 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 22 Jan 2014 23:53:56 -0800 Subject: [PATCH] Doc fixes related to zero prefix argument of eval-expression etc * emacs-lisp/lisp-mode.el (eval-print-last-sexp, eval-last-sexp): * simple.el (eval-expression): Doc fixes. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/lisp-mode.el | 25 ++++++++++++++----------- lisp/simple.el | 21 +++++++++++---------- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 62cf608585c..962fbcf89d9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-01-23 Glenn Morris + + * emacs-lisp/lisp-mode.el (eval-print-last-sexp, eval-last-sexp): + * simple.el (eval-expression): Doc fixes. + 2014-01-22 Glenn Morris * emacs-lisp/authors.el (authors-fixed-entries): Addition. diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 1e76ebb1873..472ce804409 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -867,14 +867,15 @@ Semicolons start comments. (defun eval-print-last-sexp (&optional eval-last-sexp-arg-internal) "Evaluate sexp before point; print value into current buffer. -If `eval-expression-debug-on-error' is non-nil, which is the default, -this command arranges for all errors to enter the debugger. +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). -Note that printing the result is controlled by the variables -`eval-expression-print-length' and `eval-expression-print-level', -which see. With a zero prefix arg, print output with no limit -on the length and level of lists, and include additional formats -for integers (octal, hexadecimal, and character)." +If `eval-expression-debug-on-error' is non-nil, which is the default, +this command arranges for all errors to enter the debugger." (interactive "P") (let ((standard-output (current-buffer))) (terpri) @@ -1084,10 +1085,12 @@ POS specifies the starting position where EXP was found and defaults to point." (defun eval-last-sexp (eval-last-sexp-arg-internal) "Evaluate sexp before point; print value in the echo area. Interactively, with prefix argument, print output into current buffer. -Truncates long output according to the value of the variables -`eval-expression-print-length' and `eval-expression-print-level'. -With a zero prefix arg, print output with no limit on the length -and level of lists, and include additional formats for integers + +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). If `eval-expression-debug-on-error' is non-nil, which is the default, diff --git a/lisp/simple.el b/lisp/simple.el index aacd3ccf1ca..5eb0a04471f 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1396,17 +1396,18 @@ display the result of expression evaluation." ;; for the sake of completion of names like eval-region, eval-buffer. (defun eval-expression (exp &optional insert-value) "Evaluate EXP and print value in the echo area. -When called interactively, read an Emacs Lisp expression and -evaluate it. +When called interactively, read an Emacs Lisp expression and evaluate it. Value is also consed on to front of the variable `values'. -Optional argument INSERT-VALUE non-nil (interactively, -with prefix argument) means insert the result into the current buffer -instead of printing it in the echo area. With a zero prefix arg, -insert the result with no limit on the length and level of lists, -and include additional formats for integers (octal, hexadecimal, -and character). Truncates long output according to the value -of the variables `eval-expression-print-length' -and `eval-expression-print-level'. +Optional argument INSERT-VALUE non-nil (interactively, with prefix +argument) means insert the result into the current buffer instead of +printing it in the echo area. + +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). If `eval-expression-debug-on-error' is non-nil, which is the default, this command arranges for all errors to enter the debugger." -- 2.39.2