diff options
| author | Ken Raeburn <raeburn@raeburn.org> | 2015-11-01 01:42:21 -0400 |
|---|---|---|
| committer | Ken Raeburn <raeburn@raeburn.org> | 2015-11-01 01:42:21 -0400 |
| commit | 39372e1a1032521be74575bb06f95a3898fbae30 (patch) | |
| tree | 754bd242a23d2358ea116126fcb0a629947bd9ec /lisp/calc/calc-misc.el | |
| parent | 6a3121904d76e3b2f63007341d48c5c1af55de80 (diff) | |
| parent | e11aaee266da52937a3a031cb108fe13f68958c3 (diff) | |
| download | emacs-39372e1a1032521be74575bb06f95a3898fbae30.tar.gz | |
merge from trunk
Diffstat (limited to 'lisp/calc/calc-misc.el')
| -rw-r--r-- | lisp/calc/calc-misc.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el index 405131937f9..aa0ccb79edd 100644 --- a/lisp/calc/calc-misc.el +++ b/lisp/calc/calc-misc.el @@ -1,6 +1,6 @@ ;;; calc-misc.el --- miscellaneous functions for Calc -;; Copyright (C) 1990-1993, 2001-2013 Free Software Foundation, Inc. +;; Copyright (C) 1990-1993, 2001-2015 Free Software Foundation, Inc. ;; Author: David Gillespie <daveg@synaptics.com> ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com> @@ -89,7 +89,7 @@ For use with Embedded mode: N calc-embedded-next. Advance cursor to next known formula in buffer. P calc-embedded-previous. Advance cursor to previous known formula. U calc-embedded-update-formula. Re-evaluate formula at point. - ` calc-embedded-edit. Use calc-edit to edit formula at point. + \\=` calc-embedded-edit. Use calc-edit to edit formula at point. Documentation: I calc-info. Read the Calculator manual in the Emacs Info system. @@ -225,7 +225,7 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C). "Letter keys: SHIFT + Num-eval; More-recn; eXec-kbd-macro; Keep-args" "Other keys: +, -, *, /, ^, \\ (int div), : (frac div)" "Other keys: & (1/x), | (concat), % (modulo), ! (factorial)" - "Other keys: ' (alg-entry), = (eval), ` (edit); M-RET (last-args)" + "Other keys: \\=' (alg-entry), = (eval), \\=` (edit); M-RET (last-args)" "Other keys: SPC/RET (enter/dup), LFD (over); < > (scroll horiz)" "Other keys: DEL (drop), M-DEL (drop-above); { } (scroll vert)" "Other keys: TAB (swap/roll-dn), M-TAB (roll-up)" @@ -253,11 +253,12 @@ Calc user interface as before (either C-x * C or C-x * K; initially C-x * C). 0)) (let ((msg (nth calc-help-phase msgs))) (message "%s" (if msg - (concat msg ":" + (concat (substitute-command-keys msg) ":" (make-string (- (apply 'max (mapcar 'length msgs)) - (length msg)) 32) + (length msg)) + ?\ ) " [?=MORE]") "")))))))) @@ -952,7 +953,7 @@ Prompts for bug subject. Leaves you in a mail buffer." nil nil nil "Please describe exactly what actions triggered the bug and the precise symptoms of the bug. If possible, include a backtrace by -doing 'M-x toggle-debug-on-error', then reproducing the bug. +doing `\\[toggle-debug-on-error]', then reproducing the bug. " ))) ;;;###autoload (defalias 'calc-report-bug 'report-calc-bug) |