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

[Chong Yidong]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.459 emacs/lisp/info.el:1.460
*** emacs/lisp/info.el:1.459    Fri Nov  4 17:24:09 2005
--- emacs/lisp/info.el  Wed Nov 23 17:57:46 2005
***************
*** 3805,3811 ****
                                                    (match-string 4))
                                               (match-string 2)))))
                                   (file (file-name-nondirectory
!                                         Info-current-file))
                                   (hl Info-history-list)
                                   res)
                              (if (string-match "(\\([^)]+\\))\\([^)]*\\)" node)
--- 3805,3814 ----
                                                    (match-string 4))
                                               (match-string 2)))))
                                   (file (file-name-nondirectory
!                                         (if Info-current-file
!                                           (if (stringp Info-current-file)
!                                               Info-current-file
!                                             (buffer-file-name)))))
                                   (hl Info-history-list)
                                   res)
                              (if (string-match "(\\([^)]+\\))\\([^)]*\\)" node)
***************
*** 3816,3824 ****
                                               (match-string 2 node))))
                              (while hl
                                (if (and (string-equal node (nth 1 (car hl)))
!                                        (string-equal file
!                                                      (file-name-nondirectory
!                                                       (nth 0 (car hl)))))
                                    (setq res (car hl) hl nil)
                                  (setq hl (cdr hl))))
                              res))) 'info-xref-visited 'info-xref))
--- 3819,3829 ----
                                               (match-string 2 node))))
                              (while hl
                                (if (and (string-equal node (nth 1 (car hl)))
!                                      (or (and (eq t Info-current-file)
!                                               (eq t (nth 0 (car hl))))
!                                          (string-equal file
!                                                        (file-name-nondirectory
!                                                         (nth 0 (car hl))))))
                                    (setq res (car hl) hl nil)
                                  (setq hl (cdr hl))))
                              res))) 'info-xref-visited 'info-xref))
***************
*** 3913,3919 ****
                              (let ((node (if (equal (match-string 3) "")
                                              (match-string 1)
                                            (match-string 3)))
!                                   (file (file-name-nondirectory 
Info-current-file))
                                    (hl Info-history-list)
                                    res)
                                (if (string-match "(\\([^)]+\\))\\([^)]*\\)" 
node)
--- 3918,3928 ----
                              (let ((node (if (equal (match-string 3) "")
                                              (match-string 1)
                                            (match-string 3)))
!                                   (file (file-name-nondirectory
!                                        (if Info-current-file
!                                            (if (stringp Info-current-file)
!                                                Info-current-file
!                                              (buffer-file-name)))))
                                    (hl Info-history-list)
                                    res)
                                (if (string-match "(\\([^)]+\\))\\([^)]*\\)" 
node)
***************
*** 3924,3932 ****
                                                 (match-string 2 node))))
                                (while hl
                                  (if (and (string-equal node (nth 1 (car hl)))
!                                          (string-equal file
!                                                        (file-name-nondirectory
!                                                         (nth 0 (car hl)))))
                                      (setq res (car hl) hl nil)
                                    (setq hl (cdr hl))))
                                res))) 'info-xref-visited 'info-xref)))
--- 3933,3943 ----
                                                 (match-string 2 node))))
                                (while hl
                                  (if (and (string-equal node (nth 1 (car hl)))
!                                        (or (and (eq t Info-current-file)
!                                                 (eq t (nth 0 (car hl))))
!                                            (string-equal file
!                                                          
(file-name-nondirectory
!                                                           (nth 0 (car hl))))))
                                      (setq res (car hl) hl nil)
                                    (setq hl (cdr hl))))
                                res))) 'info-xref-visited 'info-xref)))