diff options
| author | Richard M. Stallman | 1993-04-01 22:20:19 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1993-04-01 22:20:19 +0000 |
| commit | efb8f835e5134f32ac376e3ff1ef8caa0e4ccd5e (patch) | |
| tree | e59ec5bbe8ce4f5e673958df28b205be220b6337 | |
| parent | 190c70cedcc3561ecfd340f83085d2b5dc8bf642 (diff) | |
| download | emacs-efb8f835e5134f32ac376e3ff1ef8caa0e4ccd5e.tar.gz emacs-efb8f835e5134f32ac376e3ff1ef8caa0e4ccd5e.zip | |
(eval-defun): Rename argument to avoid collision.
(eval-last-sexp): Likewise.
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 67c2a96c069..c349d594e4b 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el | |||
| @@ -221,11 +221,11 @@ if that value is non-nil." | |||
| 221 | (eval-last-sexp t) | 221 | (eval-last-sexp t) |
| 222 | (terpri))) | 222 | (terpri))) |
| 223 | 223 | ||
| 224 | (defun eval-last-sexp (arg) | 224 | (defun eval-last-sexp (eval-last-sexp-arg-internal) |
| 225 | "Evaluate sexp before point; print value in minibuffer. | 225 | "Evaluate sexp before point; print value in minibuffer. |
| 226 | With argument, print output into current buffer." | 226 | With argument, print output into current buffer." |
| 227 | (interactive "P") | 227 | (interactive "P") |
| 228 | (let ((standard-output (if arg (current-buffer) t)) | 228 | (let ((standard-output (if eval-last-sexp-arg-internal (current-buffer) t)) |
| 229 | (opoint (point))) | 229 | (opoint (point))) |
| 230 | (prin1 (let ((stab (syntax-table))) | 230 | (prin1 (let ((stab (syntax-table))) |
| 231 | (eval (unwind-protect | 231 | (eval (unwind-protect |
| @@ -237,12 +237,12 @@ With argument, print output into current buffer." | |||
| 237 | (read (current-buffer)))) | 237 | (read (current-buffer)))) |
| 238 | (set-syntax-table stab))))))) | 238 | (set-syntax-table stab))))))) |
| 239 | 239 | ||
| 240 | (defun eval-defun (arg) | 240 | (defun eval-defun (eval-defun-arg-internal) |
| 241 | "Evaluate defun that point is in or before. | 241 | "Evaluate defun that point is in or before. |
| 242 | Print value in minibuffer. | 242 | Print value in minibuffer. |
| 243 | With argument, insert value in current buffer after the defun." | 243 | With argument, insert value in current buffer after the defun." |
| 244 | (interactive "P") | 244 | (interactive "P") |
| 245 | (let ((standard-output (if arg (current-buffer) t))) | 245 | (let ((standard-output (if eval-defun-arg-internal (current-buffer) t))) |
| 246 | (prin1 (eval (save-excursion | 246 | (prin1 (eval (save-excursion |
| 247 | (end-of-defun) | 247 | (end-of-defun) |
| 248 | (beginning-of-defun) | 248 | (beginning-of-defun) |