From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Wed, 13 Jul 2011 23:35:36 +0000 (+0200)
Subject: Doc fix for eval-expression
X-Git-Tag: emacs-pretest-24.0.90~104^2~301
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=15853710e143abed3bbfab05b10960a5fc9eb79a;p=emacs.git

Doc fix for eval-expression

* simple.el (eval-expression): Note what it does if called
interactively.

Fixes: debbugs:6495
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00a48ff73c1..71faf19b621 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* simple.el (eval-expression): Note what it does if called
+	interactively (bug#6495).
+
 2011-07-13  Chong Yidong  <cyd@stupidchicken.com>
 
 	* 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."
 (defun eval-expression (eval-expression-arg
 			&optional eval-expression-insert-value)
   "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area.
+When called interactively, read an Emacs Lisp expression and
+evaluate it.
 Value is also consed on to front of the variable `values'.
 Optional argument EVAL-EXPRESSION-INSERT-VALUE non-nil (interactively,
 with prefix argument) means insert the result into the current buffer