aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/calc/calc-help.el20
1 files changed, 11 insertions, 9 deletions
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index 99df2292f25..a8de197fab1 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -4,8 +4,7 @@
4;; Free Software Foundation, Inc. 4;; Free Software Foundation, Inc.
5 5
6;; Author: David Gillespie <daveg@synaptics.com> 6;; Author: David Gillespie <daveg@synaptics.com>
7;; Maintainers: D. Goel <deego@gnufans.org> 7;; Maintainer: Jay Belanger <belanger@truman.edu>
8;; Colin Walters <walters@debian.org>
9 8
10;; This file is part of GNU Emacs. 9;; This file is part of GNU Emacs.
11 10
@@ -139,6 +138,8 @@ C-w Describe how there is no warranty for Calc."
139 (interactive "kDescribe key briefly: ") 138 (interactive "kDescribe key briefly: ")
140 (calc-describe-key key t)) 139 (calc-describe-key key t))
141 140
141(defvar Info-history)
142
142(defun calc-describe-key (key &optional briefly) 143(defun calc-describe-key (key &optional briefly)
143 (interactive "kDescribe key: ") 144 (interactive "kDescribe key: ")
144 (let ((defn (if (eq (key-binding key) 'calc-dispatch) 145 (let ((defn (if (eq (key-binding key) 'calc-dispatch)
@@ -157,7 +158,8 @@ C-w Describe how there is no warranty for Calc."
157 (lookup-key calc-help-map key2)) 158 (lookup-key calc-help-map key2))
158 (key-binding key)))) 159 (key-binding key))))
159 (inv nil) 160 (inv nil)
160 (hyp nil)) 161 (hyp nil)
162 calc-summary-indentation)
161 (while (or (equal key "I") (equal key "H")) 163 (while (or (equal key "I") (equal key "H"))
162 (if (equal key "I") 164 (if (equal key "I")
163 (setq inv (not inv)) 165 (setq inv (not inv))
@@ -400,6 +402,12 @@ C-w Describe how there is no warranty for Calc."
400 (delete-region (point-min) (point)) 402 (delete-region (point-min) (point))
401 (goto-char (point-min)))) 403 (goto-char (point-min))))
402 404
405(defvar calc-help-long-names '((?b . "binary/business")
406 (?g . "graphics")
407 (?j . "selection")
408 (?k . "combinatorics/statistics")
409 (?u . "units/statistics")))
410
403(defun calc-full-help () 411(defun calc-full-help ()
404 (interactive) 412 (interactive)
405 (with-output-to-temp-buffer "*Help*" 413 (with-output-to-temp-buffer "*Help*"
@@ -456,12 +464,6 @@ C-w Describe how there is no warranty for Calc."
456 calc-z-prefix-help))) 464 calc-z-prefix-help)))
457 (print-help-return-message))) 465 (print-help-return-message)))
458 466
459(defvar calc-help-long-names '((?b . "binary/business")
460 (?g . "graphics")
461 (?j . "selection")
462 (?k . "combinatorics/statistics")
463 (?u . "units/statistics")))
464
465(defun calc-h-prefix-help () 467(defun calc-h-prefix-help ()
466 (interactive) 468 (interactive)
467 (calc-do-prefix-help 469 (calc-do-prefix-help