diff options
| author | Jay Belanger <jay.p.belanger@gmail.com> | 2004-12-31 05:59:44 +0000 |
|---|---|---|
| committer | Jay Belanger <jay.p.belanger@gmail.com> | 2004-12-31 05:59:44 +0000 |
| commit | dcbdf5730b516d6057312ff1b66c49daa159d988 (patch) | |
| tree | 27c4abc6d3e03823724c31293117a6d0e6887af9 /lisp/calc/calc-yank.el | |
| parent | 7c31514af1d2e6ef93b262f82a9c2fddb85d41a9 (diff) | |
| download | emacs-dcbdf5730b516d6057312ff1b66c49daa159d988.tar.gz | |
(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.
Diffstat (limited to 'lisp/calc/calc-yank.el')
| -rw-r--r-- | lisp/calc/calc-yank.el | 16 |
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 () |