(calc-edit-mode): Mention C-cC-c as the way to finish, C-xk as the way

to cancel the edit.  Add cancel routine to kill-buffer-hook.

1 files changed, 7 insertions, 9 deletions

diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el
index 0470abca536..2fdfab6c6f4 100644
--- a/lisp/calc/calc-yank.el
+++ b/lisp/calc/calc-yank.el
@@ -460,16 +460,14 @@ To cancel the edit, simply kill the *Calc Edit* buffer."
     (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 "
-            (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")))
+            ".  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 ()