aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2009-10-05 11:42:18 +0000
committerEli Zaretskii2009-10-05 11:42:18 +0000
commita7a8618bcd6b8ef8c362cebaa45e5a57b8f20cd4 (patch)
tree9e6d726a8093e745969f80c05fc334f10bfce56c
parent8842cd9bbb3088102dc9c76a594df09d4113d603 (diff)
downloademacs-a7a8618bcd6b8ef8c362cebaa45e5a57b8f20cd4.tar.gz
emacs-a7a8618bcd6b8ef8c362cebaa45e5a57b8f20cd4.zip
(eval-expression): Doc fix.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/simple.el9
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eca762b7085..e0e95db2b88 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12009-10-05 Eli Zaretskii <eliz@gnu.org> 12009-10-05 Eli Zaretskii <eliz@gnu.org>
2 2
3 * simple.el (eval-expression): Doc fix.
4
3 * progmodes/cwarn.el (cwarn-mode): Doc fix. 5 * progmodes/cwarn.el (cwarn-mode): Doc fix.
4 6
52009-10-05 Michael Albinus <michael.albinus@gmx.de> 72009-10-05 Michael Albinus <michael.albinus@gmx.de>
diff --git a/lisp/simple.el b/lisp/simple.el
index aa8ee15105b..36261d4903c 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1110,10 +1110,11 @@ display the result of expression evaluation."
1110 &optional eval-expression-insert-value) 1110 &optional eval-expression-insert-value)
1111 "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area. 1111 "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area.
1112Value is also consed on to front of the variable `values'. 1112Value is also consed on to front of the variable `values'.
1113Optional argument EVAL-EXPRESSION-INSERT-VALUE, if non-nil, means 1113Optional argument EVAL-EXPRESSION-INSERT-VALUE non-nil (interactively,
1114insert the result into the current buffer instead of printing it in 1114with prefix argument) means insert the result into the current buffer
1115the echo area. Truncates long output according to the value of the 1115instead of printing it in the echo area. Truncates long output
1116variables `eval-expression-print-length' and `eval-expression-print-level'. 1116according to the value of the variables `eval-expression-print-length'
1117and `eval-expression-print-level'.
1117 1118
1118If `eval-expression-debug-on-error' is non-nil, which is the default, 1119If `eval-expression-debug-on-error' is non-nil, which is the default,
1119this command arranges for all errors to enter the debugger." 1120this command arranges for all errors to enter the debugger."