[Emacs-diffs] Changes to emacs/lisp/calc/calc-help.el [lexbind]

[Miles Bader]

Index: emacs/lisp/calc/calc-help.el
diff -c emacs/lisp/calc/calc-help.el:1.4.2.4 
emacs/lisp/calc/calc-help.el:1.4.2.5
*** emacs/lisp/calc/calc-help.el:1.4.2.4        Mon Oct 25 04:22:24 2004
--- emacs/lisp/calc/calc-help.el        Wed Dec  8 23:36:21 2004
***************
*** 4,11 ****
  ;;           Free Software Foundation, Inc.
  
  ;; Author: David Gillespie <address@hidden>
! ;; Maintainers: D. Goel <address@hidden>
! ;;              Colin Walters <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
--- 4,10 ----
  ;;           Free Software Foundation, Inc.
  
  ;; Author: David Gillespie <address@hidden>
! ;; Maintainer: Jay Belanger <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
***************
*** 29,41 ****
  ;;; Code:
  
  ;; This file is autoloaded from calc-ext.el.
- (require 'calc-ext)
  
  (require 'calc-macs)
  
- (defun calc-Need-calc-help () nil)
- 
- 
  (defun calc-help-prefix (arg)
    "This key is the prefix for Calc help functions.  See calc-help-for-help."
    (interactive "P")
--- 28,37 ----
  ;;; Code:
  
  ;; This file is autoloaded from calc-ext.el.
  
+ (require 'calc-ext)
  (require 'calc-macs)
  
  (defun calc-help-prefix (arg)
    "This key is the prefix for Calc help functions.  See calc-help-for-help."
    (interactive "P")
***************
*** 139,144 ****
--- 135,142 ----
    (interactive "kDescribe key briefly: ")
    (calc-describe-key key t))
  
+ (defvar Info-history)
+ 
  (defun calc-describe-key (key &optional briefly)
    (interactive "kDescribe key: ")
    (let ((defn (if (eq (key-binding key) 'calc-dispatch)
***************
*** 157,163 ****
                      (lookup-key calc-help-map key2))
                  (key-binding key))))
        (inv nil)
!       (hyp nil))
      (while (or (equal key "I") (equal key "H"))
        (if (equal key "I")
          (setq inv (not inv))
--- 155,162 ----
                      (lookup-key calc-help-map key2))
                  (key-binding key))))
        (inv nil)
!       (hyp nil)
!         calc-summary-indentation)
      (while (or (equal key "I") (equal key "H"))
        (if (equal key "I")
          (setq inv (not inv))
***************
*** 187,197 ****
                                 (copy-to-buffer "*Calc Summary*"
                                                 (point) (point-max))
                                   (if Info-history
!                                      (Info-last))))
!                            (setq case-fold-search nil)
!                            (re-search-forward "^\\(.*\\)\\[\\.\\. a b")
!                            (setq calc-summary-indentation
!                                  (- (match-end 1) (match-beginning 1)))))
                       (goto-char (point-min))
                       (setq target (if (and (string-match "[0-9]\\'" desc)
                                             (not (string-match "[d#]" desc)))
--- 186,197 ----
                                 (copy-to-buffer "*Calc Summary*"
                                                 (point) (point-max))
                                   (if Info-history
!                                      (Info-last))))))
!                        (goto-char (point-min))
!                        (setq case-fold-search nil)
!                        (re-search-forward "^\\(.*\\)\\[\\.\\. a b")
!                        (setq calc-summary-indentation
!                              (- (match-end 1) (match-beginning 1)))
                       (goto-char (point-min))
                       (setq target (if (and (string-match "[0-9]\\'" desc)
                                             (not (string-match "[d#]" desc)))
***************
*** 400,405 ****
--- 400,411 ----
      (delete-region (point-min) (point))
      (goto-char (point-min))))
  
+ (defvar calc-help-long-names '((?b . "binary/business")
+                              (?g . "graphics")
+                              (?j . "selection")
+                              (?k . "combinatorics/statistics")
+                              (?u . "units/statistics")))
+ 
  (defun calc-full-help ()
    (interactive)
    (with-output-to-temp-buffer "*Help*"
***************
*** 456,467 ****
                calc-z-prefix-help)))
      (print-help-return-message)))
  
- (defvar calc-help-long-names '((?b . "binary/business")
-                              (?g . "graphics")
-                              (?j . "selection")
-                              (?k . "combinatorics/statistics")
-                              (?u . "units/statistics")))
- 
  (defun calc-h-prefix-help ()
    (interactive)
    (calc-do-prefix-help
--- 462,467 ----
***************
*** 674,678 ****
--- 674,680 ----
       "} (matrix brackets); . (abbreviate); / (multi-lines)")
     "vec/mat" ?v))
  
+ (provide 'calc-help)
+ 
  ;; arch-tag: 2d347593-7591-449e-a64a-93dab5f2f686
  ;;; calc-help.el ends here