[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.10 emacs/lisp/calc/calc-yank.el:1.11
*** emacs/lisp/calc/calc-yank.el:1.10   Tue Nov 30 17:29:04 2004
--- emacs/lisp/calc/calc-yank.el        Fri Dec 31 05:59:44 2004
***************
*** 460,475 ****
      (make-local-variable 'calc-allow-ret)
      (setq calc-allow-ret allow-ret)
      (erase-buffer)
      (insert (or title title "Calc Edit Mode")
!           ".  Press "
!           (if (eq (lookup-key (current-global-map) "\e#") 'calc-dispatch)
!               "M-# M-# or C-c C-c"
!             (if allow-ret "C-c C-c" "RET"))
!           " to finish, "
!           (if (eq (lookup-key (current-global-map) "\e#") 'calc-dispatch)
!               "M-# x"
!             "C-x k RET")
!           " to cancel.\n")))
  (put 'calc-edit-mode 'mode-class 'special)
  
  (defun calc-show-edit-buffer ()
--- 460,473 ----
      (make-local-variable 'calc-allow-ret)
      (setq calc-allow-ret allow-ret)
      (erase-buffer)
+     (add-hook 'kill-buffer-hook (lambda () 
+                                   (let ((calc-edit-handler nil))
+                                     (calc-edit-finish t))
+                                   (message "(Cancelled)")) t t)
      (insert (or title title "Calc Edit Mode")
!           ".  Press `C-c C-c'"
!             (if allow-ret "" " or RET")
!           " to finish, `C-x k RET' to cancel.\n")))
  (put 'calc-edit-mode 'mode-class 'special)
  
  (defun calc-show-edit-buffer ()