diff options
Diffstat (limited to 'lisp/calc')
| -rw-r--r-- | lisp/calc/calc-embed.el | 2 | ||||
| -rw-r--r-- | lisp/calc/calc-misc.el | 7 | ||||
| -rw-r--r-- | lisp/calc/calc-prog.el | 2 | ||||
| -rw-r--r-- | lisp/calc/calc.el | 19 |
4 files changed, 16 insertions, 14 deletions
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el index 4127c0b33da..7878034694e 100644 --- a/lisp/calc/calc-embed.el +++ b/lisp/calc/calc-embed.el @@ -315,7 +315,7 @@ (or (eq calc-embedded-quiet t) (message "Embedded Calc mode enabled; %s to return to normal" (if calc-embedded-quiet - "Type `M-# x'" + "Type `C-x * x'" "Give this command again"))))) (scroll-down 0)) ; fix a bug which occurs when truncate-lines is changed. diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el index ba80f455b4f..ca8e8bbdbfe 100644 --- a/lisp/calc/calc-misc.el +++ b/lisp/calc/calc-misc.el @@ -33,7 +33,7 @@ (require 'calc-macs) (defun calc-dispatch-help (arg) - "M-# is a prefix key; follow it with one of these letters: + "C-x* is a prefix key sequence; follow it with one of these letters: For turning Calc on and off: C calc. Start the Calculator in a window at the bottom of the screen. @@ -73,8 +73,9 @@ Miscellaneous: M read-kbd-macro. Read a region of keystroke names as a keyboard macro. 0 (zero) calc-reset. Reset Calc stack and modes to default state. -Press twice (`M-# M-#' or `M-# #') to turn Calc on or off using the same -Calc user interface as before (either M-# C or M-# K; initially M-# C)." +Press `*' twice (`C-x * *') to turn Calc on or off using the same +Calc user interface as before (either C-x * C or C-x * K; initially C-x * C). +" (interactive "P") (calc-check-defines) (if calc-dispatch-help diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el index 2bbbbcceee5..8736d4375dd 100644 --- a/lisp/calc/calc-prog.el +++ b/lisp/calc/calc-prog.el @@ -667,7 +667,7 @@ (or last-kbd-macro (error "No keyboard macro defined")) (setq calc-invocation-macro last-kbd-macro) - (message "Use `M-# Z' to invoke this macro")) + (message "Use `C-x * Z' to invoke this macro")) (defun calc-user-define-edit () (interactive) ; but no calc-wrapper! diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el index bd161132ddf..fe55b7587f3 100644 --- a/lisp/calc/calc.el +++ b/lisp/calc/calc.el @@ -816,11 +816,6 @@ If nil, selections displayed but ignored.") ;; Verify that Calc is running on the right kind of system. (defvar calc-emacs-type-lucid (not (not (string-match "Lucid" emacs-version)))) -;; Set up the standard keystroke (M-#) to run the Calculator, if that key -;; has not yet been bound to anything. For best results, the user should -;; do this before Calc is even loaded, so that M-# can auto-load Calc. -(or (global-key-binding "\e#") (global-set-key "\e#" 'calc-dispatch)) - ;; Set up the autoloading linkage. (let ((name (and (fboundp 'calc-dispatch) (eq (car-safe (symbol-function 'calc-dispatch)) 'autoload) @@ -1046,14 +1041,20 @@ If nil, selections displayed but ignored.") ( ?x . calc-quit ) ( ?y . calc-copy-to-buffer ) ( ?z . calc-user-invocation ) - ( ?= . calc-embedded-update-formula ) ( ?\' . calc-embedded-new-formula ) ( ?\` . calc-embedded-edit ) ( ?: . calc-grab-sum-down ) ( ?_ . calc-grab-sum-across ) ( ?0 . calc-reset ) + ( ?? . calc-dispatch-help ) ( ?# . calc-same-interface ) - ( ?? . calc-dispatch-help ) )) + ( ?& . calc-same-interface ) + ( ?\\ . calc-same-interface ) + ( ?= . calc-same-interface ) + ( ?* . calc-same-interface ) + ( ?/ . calc-same-interface ) + ( ?+ . calc-same-interface ) + ( ?- . calc-same-interface ) )) map)) ;;;; (Autoloads here) @@ -1095,7 +1096,7 @@ If nil, selections displayed but ignored.") report-calc-bug))) -;;;###autoload (global-set-key "\e#" 'calc-dispatch) +;;;###autoload (define-key ctl-x-map "*" 'calc-dispatch) ;;;###autoload (defun calc-dispatch (&optional arg) @@ -3534,7 +3535,7 @@ Also looks for the equivalent TeX words, \\gets and \\evalto." (defun calc-user-invocation () (interactive) (unless calc-invocation-macro - (error "Use `Z I' inside Calc to define a `M-# Z' keyboard macro")) + (error "Use `Z I' inside Calc to define a `C-x * Z' keyboard macro")) (execute-kbd-macro calc-invocation-macro nil)) ;;; User-programmability. |