[Emacs-diffs] Changes to emacs/lisp/calc/calc-yank.el

[Jay Belanger]

Index: emacs/lisp/calc/calc-yank.el
diff -c emacs/lisp/calc/calc-yank.el:1.7 emacs/lisp/calc/calc-yank.el:1.8
*** emacs/lisp/calc/calc-yank.el:1.7    Mon Sep  1 15:45:18 2003
--- emacs/lisp/calc/calc-yank.el        Fri Nov 19 22:17:25 2004
***************
*** 492,497 ****
--- 492,501 ----
        (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,513 ****
        (original calc-original-buffer)
        (return calc-return-buffer)
        (one-window calc-one-window)
!       (disp-trail calc-restore-trail))
      (save-excursion
        (when (or (null (buffer-name original))
                (progn
--- 511,517 ----
        (original calc-original-buffer)
        (return calc-return-buffer)
        (one-window calc-one-window)
!       (calc-edit-disp-trail calc-restore-trail))
      (save-excursion
        (when (or (null (buffer-name original))
                (progn
***************
*** 527,533 ****
      (if keep
        (bury-buffer buf)
        (kill-buffer buf))
!     (if disp-trail
        (calc-wrapper
         (calc-trail-display 1 t)))
      (message "")))
--- 531,537 ----
      (if keep
        (bury-buffer buf)
        (kill-buffer buf))
!     (if calc-edit-disp-trail
        (calc-wrapper
         (calc-trail-display 1 t)))
      (message "")))
***************
*** 561,567 ****
           (progn
             (set num (car vals))
             (calc-refresh-evaltos num))
!        (if disp-trail
             (calc-trail-display 1 t))
         (and vals
              (let ((calc-simplify-mode (if (eq last-command-char ?\C-j)
--- 565,571 ----
           (progn
             (set num (car vals))
             (calc-refresh-evaltos num))
!        (if calc-edit-disp-trail
             (calc-trail-display 1 t))
         (and vals
              (let ((calc-simplify-mode (if (eq last-command-char ?\C-j)