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

[Juri Linkov]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.418 emacs/lisp/info.el:1.419
*** emacs/lisp/info.el:1.418    Tue Mar  8 21:50:11 2005
--- emacs/lisp/info.el  Sat Mar 12 02:18:32 2005
***************
*** 1502,1508 ****
                            ;; Skip node header line
                            (and (save-excursion (forward-line -1)
                                                 (looking-at "\^_"))
!                                (forward-line 1))
                            ;; Skip Tag Table node
                            (save-excursion
                              (and (search-backward "\^_" nil t)
--- 1502,1508 ----
                            ;; Skip node header line
                            (and (save-excursion (forward-line -1)
                                                 (looking-at "\^_"))
!                                (forward-line (if backward -1 1)))
                            ;; Skip Tag Table node
                            (save-excursion
                              (and (search-backward "\^_" nil t)
***************
*** 1540,1545 ****
--- 1540,1546 ----
                  (search-forward (concat "\n" osubfile ": "))
                  ;; Skip that one.
                  (forward-line (if backward 0 1))
+                 (if backward (forward-char -1))
                  ;; Make a list of all following subfiles.
                  ;; Each elt has the form (VIRT-POSITION . SUBFILENAME).
                  (while (not (if backward (bobp) (eobp)))
***************
*** 1578,1584 ****
                                  ;; Skip node header line
                                  (and (save-excursion (forward-line -1)
                                                       (looking-at "\^_"))
!                                      (forward-line 1))
                                  ;; Skip Tag Table node
                                  (save-excursion
                                    (and (search-backward "\^_" nil t)
--- 1579,1585 ----
                                  ;; Skip node header line
                                  (and (save-excursion (forward-line -1)
                                                       (looking-at "\^_"))
!                                      (forward-line (if backward -1 1)))
                                  ;; Skip Tag Table node
                                  (save-excursion
                                    (and (search-backward "\^_" nil t)
***************
*** 1615,1621 ****
        ;; Use string-equal, not equal, to ignore text props.
        (or (and (string-equal onode Info-current-node)
               (equal ofile Info-current-file))
!           (and isearch-mode isearch-wrapped (eq opoint opoint-min))
          (setq Info-history (cons (list ofile onode opoint)
                                   Info-history))))))
  
--- 1616,1623 ----
        ;; Use string-equal, not equal, to ignore text props.
        (or (and (string-equal onode Info-current-node)
               (equal ofile Info-current-file))
!           (and isearch-mode isearch-wrapped
!              (eq opoint (if isearch-forward opoint-min opoint-max)))
          (setq Info-history (cons (list ofile onode opoint)
                                   Info-history))))))