procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* info.el (Info-fontify-node): Match external links using

Browse source 
non-directory part of filename.
This commit is contained in:
Chong Yidong 2005-12-04 04:31:59 +00:00
parent 4d4a3fb397
commit d8fbba2278
2 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2005-12-03 Chong Yidong <cyd@stupidchicken.com>
* info.el (Info-fontify-node): Match external links using
non-directory part of filename.
2005-12-04 Juri Linkov <juri@jurta.org>
* font-core.el (global-font-lock-mode): Use define-global-minor-mode

45
lisp/info.el
View file

@ -3800,17 +3800,25 @@ the variable `Info-file-list-for-emacs'."
(and (not (equal (match-string 4) ""))
(match-string 4))
(match-string 2)))))
(file Info-current-file)
(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 (string-match "(\\([^)]+\\))\\([^)]*\\)" node)
(setq file (Info-find-file (match-string 1 node) t)
node (if (equal (match-string 2 node) "")
(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 (nth 0 (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,20 +3910,27 @@ the variable `Info-file-list-for-emacs'."
;; 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) "")
(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 (nth 0 (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)))