Mercurial > emacs
changeset 58335:4e7e96bc6b95
(calc-edit-disp-trail): New variable.
(calc-edit-finish, calc-finish-stack-edit): Replace variable
disp-trail by declared variable.
| author | Jay Belanger <jay.p.belanger@gmail.com> |
|---|---|
| date | Fri, 19 Nov 2004 22:17:25 +0000 |
| parents | 3e50ecebe821 |
| children | 2d07929a4d0b |
| files | lisp/calc/calc-yank.el |
| diffstat | 1 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/calc/calc-yank.el Fri Nov 19 21:12:32 2004 +0000 +++ b/lisp/calc/calc-yank.el Fri Nov 19 22:17:25 2004 +0000 @@ -492,6 +492,10 @@ (newline) (calc-edit-finish))) +;; The variable calc-edit-disp-trail is local to calc-edit finish, but +;; is used by calc-finish-selection-edit and calc-finish-stack-edit. +(defvar calc-edit-disp-trail) + (defun calc-edit-finish (&optional keep) "Finish calc-edit mode. Parse buffer contents and push them on the stack." (interactive "P") @@ -507,7 +511,7 @@ (original calc-original-buffer) (return calc-return-buffer) (one-window calc-one-window) - (disp-trail calc-restore-trail)) + (calc-edit-disp-trail calc-restore-trail)) (save-excursion (when (or (null (buffer-name original)) (progn @@ -527,7 +531,7 @@ (if keep (bury-buffer buf) (kill-buffer buf)) - (if disp-trail + (if calc-edit-disp-trail (calc-wrapper (calc-trail-display 1 t))) (message ""))) @@ -561,7 +565,7 @@ (progn (set num (car vals)) (calc-refresh-evaltos num)) - (if disp-trail + (if calc-edit-disp-trail (calc-trail-display 1 t)) (and vals (let ((calc-simplify-mode (if (eq last-command-char ?\C-j)