[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112483: * lisp/emacs-lisp/lisp-mode.
From: |
Juri Linkov |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112483: * lisp/emacs-lisp/lisp-mode.el (eval-defun-2): Doc fix. |
Date: |
Mon, 06 May 2013 23:23:40 +0300 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 112483
fixes bug: http://debbugs.gnu.org/14344
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Mon 2013-05-06 23:23:40 +0300
message:
* lisp/emacs-lisp/lisp-mode.el (eval-defun-2): Doc fix.
(eval-defun-2, eval-defun, eval-last-sexp, eval-last-sexp-1): Doc fix.
(emacs-lisp-mode-map): Replace "minibuffer" with "echo area"
in the help string. (Bug#12985)
modified:
lisp/ChangeLog
lisp/emacs-lisp/lisp-mode.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-05-06 20:11:40 +0000
+++ b/lisp/ChangeLog 2013-05-06 20:23:40 +0000
@@ -1,3 +1,11 @@
+2013-05-06 Juri Linkov <address@hidden>
+
+ * emacs-lisp/lisp-mode.el (eval-defun-2): Doc fix. (Bug#14344)
+ (eval-defun-2, eval-defun, eval-last-sexp, eval-last-sexp-1):
+ Doc fix.
+ (emacs-lisp-mode-map): Replace "minibuffer" with "echo area"
+ in the help string. (Bug#12985)
+
2013-05-06 Kelly Dean <address@hidden> (tiny change)
* simple.el (shell-command-on-region): Doc fix. (Bug#14279)
=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- a/lisp/emacs-lisp/lisp-mode.el 2013-03-23 22:04:40 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el 2013-05-06 20:23:40 +0000
@@ -394,7 +394,7 @@
:enable mark-active))
(bindings--define-key menu-map [eval-sexp]
'(menu-item "Evaluate Last S-expression" eval-last-sexp
- :help "Evaluate sexp before point; print value in
minibuffer"))
+ :help "Evaluate sexp before point; print value in echo area"))
(bindings--define-key menu-map [separator-format] menu-bar-separator)
(bindings--define-key menu-map [comment-region]
'(menu-item "Comment Out Region" comment-region
@@ -772,7 +772,7 @@
(defun eval-last-sexp-1 (eval-last-sexp-arg-internal)
- "Evaluate sexp before point; print value in minibuffer.
+ "Evaluate sexp before point; print value in the echo area.
With argument, print output into current buffer."
(let ((standard-output (if eval-last-sexp-arg-internal (current-buffer) t)))
;; Setup the lexical environment if lexical-binding is enabled.
@@ -825,7 +825,7 @@
`(progn ,@(mapcar (lambda (v) `(defvar ,v)) vars) ,exp)))))
(defun eval-last-sexp (eval-last-sexp-arg-internal)
- "Evaluate sexp before point; print value in minibuffer.
+ "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'.
@@ -891,14 +891,13 @@
(defun eval-defun-2 ()
"Evaluate defun that point is in or before.
-The value is displayed in the minibuffer.
+The value is displayed in the echo area.
If the current defun is actually a call to `defvar',
then reset the variable using the initial value expression
even if the variable already has some other value.
\(Normally `defvar' does not change the variable's value
if it already has a value.\)
-With argument, insert value in current buffer after the defun.
Return the result of evaluation."
;; FIXME: the print-length/level bindings should only be applied while
;; printing, not while evaluating.
@@ -950,11 +949,11 @@
With a prefix argument, instrument the code for Edebug.
If acting on a `defun' for FUNCTION, and the function was
-instrumented, `Edebug: FUNCTION' is printed in the minibuffer. If not
+instrumented, `Edebug: FUNCTION' is printed in the echo area. If not
instrumented, just FUNCTION is printed.
If not acting on a `defun', the result of evaluation is displayed in
-the minibuffer. This display is controlled by the variables
+the echo area. This display is controlled by the variables
`eval-expression-print-length' and `eval-expression-print-level',
which see."
(interactive "P")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112483: * lisp/emacs-lisp/lisp-mode.el (eval-defun-2): Doc fix.,
Juri Linkov <=