[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/info.el
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/info.el |
Date: |
Sat, 03 Dec 2005 23:32:00 -0500 |
Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.464 emacs/lisp/info.el:1.465
*** emacs/lisp/info.el:1.464 Fri Dec 2 15:07:15 2005
--- emacs/lisp/info.el Sun Dec 4 04:31:59 2005
***************
*** 3800,3816 ****
(and (not (equal (match-string
4) ""))
(match-string 4))
(match-string 2)))))
! (file Info-current-file)
(hl Info-history-list)
res)
! (if (string-match "(\\([^)]+\\))\\([^)]*\\)" node)
! (setq file (Info-find-file (match-string 1
node) t)
! node (if (equal (match-string 2 node)
"")
"Top"
(match-string 2 node))))
(while hl
(if (and (string-equal node (nth 1 (car hl)))
! (string-equal file (nth 0 (car hl))))
(setq res (car hl) hl nil)
(setq hl (cdr hl))))
res))) 'info-xref-visited 'info-xref))
--- 3800,3824 ----
(and (not (equal (match-string
4) ""))
(match-string 4))
(match-string 2)))))
! (external-link-p
! (string-match "(\\([^)]+\\))\\([^)]*\\)"
node))
! (file (if external-link-p
! (file-name-nondirectory
! (match-string 1 node))
! Info-current-file))
(hl Info-history-list)
res)
! (if external-link-p
! (setq node (if (equal (match-string 2 node) "")
"Top"
(match-string 2 node))))
(while hl
(if (and (string-equal node (nth 1 (car hl)))
! (string-equal
! file (if external-link-p
! (file-name-nondirectory
! (caar hl))
! (caar hl))))
(setq res (car hl) hl nil)
(setq hl (cdr hl))))
res))) 'info-xref-visited 'info-xref))
***************
*** 3902,3921 ****
;; Display visited menu items in a different face
(if (and Info-fontify-visited-nodes
(save-match-data
! (let ((node (if (equal (match-string 3) "")
! (match-string 1)
! (match-string 3)))
! (file Info-current-file)
! (hl Info-history-list)
! res)
! (if (string-match "(\\([^)]+\\))\\([^)]*\\)"
node)
! (setq file (Info-find-file (match-string 1
node) t)
! node (if (equal (match-string 2 node)
"")
"Top"
(match-string 2 node))))
(while hl
(if (and (string-equal node (nth 1 (car hl)))
! (string-equal file (nth 0 (car hl))))
(setq res (car hl) hl nil)
(setq hl (cdr hl))))
res))) 'info-xref-visited 'info-xref)))
--- 3910,3936 ----
;; Display visited menu items in a different face
(if (and Info-fontify-visited-nodes
(save-match-data
! (let* ((node (if (equal (match-string 3) "")
! (match-string 1)
! (match-string 3)))
! (external-link-p
! (string-match "(\\([^)]+\\))\\([^)]*\\)"
node))
! (file (if external-link-p
! (file-name-nondirectory
! (match-string 1 node))
! Info-current-file))
! (hl Info-history-list)
! res)
! (if external-link-p
! (setq node (if (equal (match-string 2 node)
"")
"Top"
(match-string 2 node))))
(while hl
(if (and (string-equal node (nth 1 (car hl)))
! (string-equal
! file (if external-link-p
! (file-name-nondirectory
(caar hl))
! (caar hl))))
(setq res (car hl) hl nil)
(setq hl (cdr hl))))
res))) 'info-xref-visited 'info-xref)))