aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-07-14 01:35:36 +0200
committerLars Magne Ingebrigtsen2011-07-14 01:35:36 +0200
commit15853710e143abed3bbfab05b10960a5fc9eb79a (patch)
treeed0e48c9c6eaa3e8105abfd6e94c10dbaa21acd1
parent0bc59b255ed42e57192b0d41c4848685d1019490 (diff)
downloademacs-15853710e143abed3bbfab05b10960a5fc9eb79a.tar.gz
emacs-15853710e143abed3bbfab05b10960a5fc9eb79a.zip
Doc fix for eval-expression
* simple.el (eval-expression): Note what it does if called interactively. Fixes: debbugs:6495
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/simple.el2
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00a48ff73c1..71faf19b621 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * simple.el (eval-expression): Note what it does if called
4 interactively (bug#6495).
5
12011-07-13 Chong Yidong <cyd@stupidchicken.com> 62011-07-13 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * window.el (switch-to-buffer): New arg FORCE-SAME-WINDOW. Use 8 * window.el (switch-to-buffer): New arg FORCE-SAME-WINDOW. Use
diff --git a/lisp/simple.el b/lisp/simple.el
index 895496a34f8..64333402924 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1152,6 +1152,8 @@ display the result of expression evaluation."
1152(defun eval-expression (eval-expression-arg 1152(defun eval-expression (eval-expression-arg
1153 &optional eval-expression-insert-value) 1153 &optional eval-expression-insert-value)
1154 "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area. 1154 "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area.
1155When called interactively, read an Emacs Lisp expression and
1156evaluate it.
1155Value is also consed on to front of the variable `values'. 1157Value is also consed on to front of the variable `values'.
1156Optional argument EVAL-EXPRESSION-INSERT-VALUE non-nil (interactively, 1158Optional argument EVAL-EXPRESSION-INSERT-VALUE non-nil (interactively,
1157with prefix argument) means insert the result into the current buffer 1159with prefix argument) means insert the result into the current buffer