diff options
| author | Glenn Morris | 2014-01-22 23:53:56 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-01-22 23:53:56 -0800 |
| commit | 1670e27f383c96eb19bb2049c760a8bd5d2eec12 (patch) | |
| tree | d8abc0e3e63731801d3c8b0ae562fcc20601043c | |
| parent | 51fb39ec639a79f3fdcc378f5d99b0703a57e317 (diff) | |
| download | emacs-1670e27f383c96eb19bb2049c760a8bd5d2eec12.tar.gz emacs-1670e27f383c96eb19bb2049c760a8bd5d2eec12.zip | |
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.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 25 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2014-01-23 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs-lisp/lisp-mode.el (eval-print-last-sexp, eval-last-sexp): | ||
| 4 | * simple.el (eval-expression): Doc fixes. | ||
| 5 | |||
| 1 | 2014-01-22 Glenn Morris <rgm@gnu.org> | 6 | 2014-01-22 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * emacs-lisp/authors.el (authors-fixed-entries): Addition. | 8 | * 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. | |||
| 867 | (defun eval-print-last-sexp (&optional eval-last-sexp-arg-internal) | 867 | (defun eval-print-last-sexp (&optional eval-last-sexp-arg-internal) |
| 868 | "Evaluate sexp before point; print value into current buffer. | 868 | "Evaluate sexp before point; print value into current buffer. |
| 869 | 869 | ||
| 870 | If `eval-expression-debug-on-error' is non-nil, which is the default, | 870 | Normally, this function truncates long output according to the value |
| 871 | this command arranges for all errors to enter the debugger. | 871 | of the variables `eval-expression-print-length' and |
| 872 | `eval-expression-print-level'. With a prefix argument of zero, | ||
| 873 | however, there is no such truncation. Such a prefix argument | ||
| 874 | also causes integers to be printed in several additional formats | ||
| 875 | \(octal, hexadecimal, and character). | ||
| 872 | 876 | ||
| 873 | Note that printing the result is controlled by the variables | 877 | If `eval-expression-debug-on-error' is non-nil, which is the default, |
| 874 | `eval-expression-print-length' and `eval-expression-print-level', | 878 | this command arranges for all errors to enter the debugger." |
| 875 | which see. With a zero prefix arg, print output with no limit | ||
| 876 | on the length and level of lists, and include additional formats | ||
| 877 | for integers (octal, hexadecimal, and character)." | ||
| 878 | (interactive "P") | 879 | (interactive "P") |
| 879 | (let ((standard-output (current-buffer))) | 880 | (let ((standard-output (current-buffer))) |
| 880 | (terpri) | 881 | (terpri) |
| @@ -1084,10 +1085,12 @@ POS specifies the starting position where EXP was found and defaults to point." | |||
| 1084 | (defun eval-last-sexp (eval-last-sexp-arg-internal) | 1085 | (defun eval-last-sexp (eval-last-sexp-arg-internal) |
| 1085 | "Evaluate sexp before point; print value in the echo area. | 1086 | "Evaluate sexp before point; print value in the echo area. |
| 1086 | Interactively, with prefix argument, print output into current buffer. | 1087 | Interactively, with prefix argument, print output into current buffer. |
| 1087 | Truncates long output according to the value of the variables | 1088 | |
| 1088 | `eval-expression-print-length' and `eval-expression-print-level'. | 1089 | Normally, this function truncates long output according to the value |
| 1089 | With a zero prefix arg, print output with no limit on the length | 1090 | of the variables `eval-expression-print-length' and |
| 1090 | and level of lists, and include additional formats for integers | 1091 | `eval-expression-print-level'. With a prefix argument of zero, |
| 1092 | however, there is no such truncation. Such a prefix argument | ||
| 1093 | also causes integers to be printed in several additional formats | ||
| 1091 | \(octal, hexadecimal, and character). | 1094 | \(octal, hexadecimal, and character). |
| 1092 | 1095 | ||
| 1093 | If `eval-expression-debug-on-error' is non-nil, which is the default, | 1096 | 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." | |||
| 1396 | ;; for the sake of completion of names like eval-region, eval-buffer. | 1396 | ;; for the sake of completion of names like eval-region, eval-buffer. |
| 1397 | (defun eval-expression (exp &optional insert-value) | 1397 | (defun eval-expression (exp &optional insert-value) |
| 1398 | "Evaluate EXP and print value in the echo area. | 1398 | "Evaluate EXP and print value in the echo area. |
| 1399 | When called interactively, read an Emacs Lisp expression and | 1399 | When called interactively, read an Emacs Lisp expression and evaluate it. |
| 1400 | evaluate it. | ||
| 1401 | Value is also consed on to front of the variable `values'. | 1400 | Value is also consed on to front of the variable `values'. |
| 1402 | Optional argument INSERT-VALUE non-nil (interactively, | 1401 | Optional argument INSERT-VALUE non-nil (interactively, with prefix |
| 1403 | with prefix argument) means insert the result into the current buffer | 1402 | argument) means insert the result into the current buffer instead of |
| 1404 | instead of printing it in the echo area. With a zero prefix arg, | 1403 | printing it in the echo area. |
| 1405 | insert the result with no limit on the length and level of lists, | 1404 | |
| 1406 | and include additional formats for integers (octal, hexadecimal, | 1405 | Normally, this function truncates long output according to the value |
| 1407 | and character). Truncates long output according to the value | 1406 | of the variables `eval-expression-print-length' and |
| 1408 | of the variables `eval-expression-print-length' | 1407 | `eval-expression-print-level'. With a prefix argument of zero, |
| 1409 | and `eval-expression-print-level'. | 1408 | however, there is no such truncation. Such a prefix argument |
| 1409 | also causes integers to be printed in several additional formats | ||
| 1410 | \(octal, hexadecimal, and character). | ||
| 1410 | 1411 | ||
| 1411 | If `eval-expression-debug-on-error' is non-nil, which is the default, | 1412 | If `eval-expression-debug-on-error' is non-nil, which is the default, |
| 1412 | this command arranges for all errors to enter the debugger." | 1413 | this command arranges for all errors to enter the debugger." |