(calc-edit-disp-trail): New variable.

(calc-edit-finish, calc-finish-stack-edit): Replace variable
disp-trail by declared variable.
This commit is contained in:
Jay Belanger
2004-11-19 22:17:25 +00:00
parent c85b00223d
commit 7fc684b392

View File

@@ -492,6 +492,10 @@ To cancel the edit, simply kill the *Calc Edit* buffer."
(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 @@ To cancel the edit, simply kill the *Calc Edit* buffer."
(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 @@ To cancel the edit, simply kill the *Calc Edit* buffer."
(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 @@ To cancel the edit, simply kill the *Calc Edit* buffer."
(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)