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

[Jay Belanger]

Index: emacs/lisp/calc/calc-help.el
diff -c emacs/lisp/calc/calc-help.el:1.7 emacs/lisp/calc/calc-help.el:1.8
*** emacs/lisp/calc/calc-help.el:1.7    Mon Sep  1 15:45:18 2003
--- emacs/lisp/calc/calc-help.el        Mon Oct 11 03:29:45 2004
***************
*** 93,110 ****
  
  (defun calc-describe-copying ()
    (interactive)
!   (calc-info)
!   (Info-goto-node "Copying"))
  
  (defun calc-describe-distribution ()
    (interactive)
!   (calc-info)
!   (Info-goto-node "Reporting Bugs"))
  
  (defun calc-describe-no-warranty ()
    (interactive)
!   (calc-info)
!   (Info-goto-node "Copying")
    (let ((case-fold-search nil))
      (search-forward "     NO WARRANTY"))
    (beginning-of-line)
--- 93,107 ----
  
  (defun calc-describe-copying ()
    (interactive)
!   (calc-info-goto-node "Copying"))
  
  (defun calc-describe-distribution ()
    (interactive)
!   (calc-info-goto-node "Reporting Bugs"))
  
  (defun calc-describe-no-warranty ()
    (interactive)
!   (calc-info-goto-node "Copying")
    (let ((case-fold-search nil))
      (search-forward "     NO WARRANTY"))
    (beginning-of-line)
***************
*** 190,202 ****
                             (message "Reading Calc summary from manual...")
                             (save-window-excursion
                               (save-excursion
!                                (calc-info)
!                                (Info-goto-node "Summary")
                                 (goto-char (point-min))
                                 (forward-line 1)
                                 (copy-to-buffer "*Calc Summary*"
                                                 (point) (point-max))
!                                (Info-last)))
                             (setq case-fold-search nil)
                             (re-search-forward "^\\(.*\\)\\[\\.\\. a b")
                             (setq calc-summary-indentation
--- 187,199 ----
                             (message "Reading Calc summary from manual...")
                             (save-window-excursion
                               (save-excursion
!                                (calc-info-goto-node "Summary")
                                 (goto-char (point-min))
                                 (forward-line 1)
                                 (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
***************
*** 326,333 ****
  (defun calc-describe-thing (thing where &optional target not-quoted)
    (message "Looking for `%s' in %s..." thing where)
    (let ((savewin (current-window-configuration)))
!     (calc-info)
!     (Info-goto-node where)
      (or (let ((case-fold-search nil))
          (re-search-forward (format "\n\\* +%s: \\(.*\\)\\."
                                     (regexp-quote thing))
--- 323,329 ----
  (defun calc-describe-thing (thing where &optional target not-quoted)
    (message "Looking for `%s' in %s..." thing where)
    (let ((savewin (current-window-configuration)))
!     (calc-info-goto-node where)
      (or (let ((case-fold-search nil))
          (re-search-forward (format "\n\\* +%s: \\(.*\\)\\."
                                     (regexp-quote thing))
***************
*** 338,344 ****
                                nil t)
             (setq thing (format "%s9" (substring thing 0 -1))))
        (progn
!         (Info-last)
          (set-window-configuration savewin)
          (error "Can't find `%s' in %s" thing where)))
      (let (Info-history)
--- 334,341 ----
                                nil t)
             (setq thing (format "%s9" (substring thing 0 -1))))
        (progn
!           (if Info-history
!               (Info-last))
          (set-window-configuration savewin)
          (error "Can't find `%s' in %s" thing where)))
      (let (Info-history)