aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2005-11-01 09:56:07 +0000
committerJuri Linkov2005-11-01 09:56:07 +0000
commit993159761a8d77bd458a8f5841daeffd5f785944 (patch)
treea9a31d841266a4670b0b8663d6120f0a7066916c
parent94b10022bfd9bd51fd6c0495c3bcaa1cb61fe63e (diff)
downloademacs-993159761a8d77bd458a8f5841daeffd5f785944.tar.gz
emacs-993159761a8d77bd458a8f5841daeffd5f785944.zip
(Info-fontify-node): Downcase node header keywords Node,
Prev, Next, Up before comparison. (Info-history): Insert absolute directory name, and put invisible property on it.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/info.el17
2 files changed, 17 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6caad6e2854..03356b20c09 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
12005-11-01 Juri Linkov <juri@jurta.org> 12005-11-01 Juri Linkov <juri@jurta.org>
2 2
3 * info.el (Info-fontify-node): Downcase node header keywords Node,
4 Prev, Next, Up before comparison.
5 (Info-history): Insert absolute directory name, and put invisible
6 property on it.
7
82005-11-01 Juri Linkov <juri@jurta.org>
9
3 * info.el (Info-file-supports-index-cookies): New variable. 10 * info.el (Info-file-supports-index-cookies): New variable.
4 (Info-find-node-2): Check makeinfo version for index cookie support. 11 (Info-find-node-2): Check makeinfo version for index cookie support.
5 (Info-index-nodes): Search for nodes with index cookies only when 12 (Info-index-nodes): Search for nodes with index cookies only when
diff --git a/lisp/info.el b/lisp/info.el
index 2c85cc9d9ab..a151bea0444 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1961,7 +1961,9 @@ If SAME-FILE is non-nil, do not move to a different Info file."
1961 (if (and (string-equal file curr-file) 1961 (if (and (string-equal file curr-file)
1962 (string-equal node curr-node)) 1962 (string-equal node curr-node))
1963 (setq p (point))) 1963 (setq p (point)))
1964 (insert "* " node ": (" (file-name-nondirectory file) 1964 (insert "* " node ": ("
1965 (propertize (or (file-name-directory file) "") 'invisible t)
1966 (file-name-nondirectory file)
1965 ")" node ".\n")) 1967 ")" node ".\n"))
1966 (setq hl (cdr hl)))))) 1968 (setq hl (cdr hl))))))
1967 (Info-find-node "history" "Top") 1969 (Info-find-node "history" "Top")
@@ -3662,7 +3664,7 @@ the variable `Info-file-list-for-emacs'."
3662 (nend (match-end 2)) 3664 (nend (match-end 2))
3663 (tbeg (match-beginning 1)) 3665 (tbeg (match-beginning 1))
3664 (tag (match-string 1))) 3666 (tag (match-string 1)))
3665 (if (string-equal tag "Node") 3667 (if (string-equal (downcase tag) "node")
3666 (put-text-property nbeg nend 'font-lock-face 'info-header-node) 3668 (put-text-property nbeg nend 'font-lock-face 'info-header-node)
3667 (put-text-property nbeg nend 'font-lock-face 'info-header-xref) 3669 (put-text-property nbeg nend 'font-lock-face 'info-header-xref)
3668 (put-text-property tbeg nend 'mouse-face 'highlight) 3670 (put-text-property tbeg nend 'mouse-face 'highlight)
@@ -3673,11 +3675,12 @@ the variable `Info-file-list-for-emacs'."
3673 ;; Always set up the text property keymap. 3675 ;; Always set up the text property keymap.
3674 ;; It will either be used in the buffer 3676 ;; It will either be used in the buffer
3675 ;; or copied in the header line. 3677 ;; or copied in the header line.
3676 (put-text-property tbeg nend 'keymap 3678 (put-text-property
3677 (cond 3679 tbeg nend 'keymap
3678 ((equal tag "Prev") Info-prev-link-keymap) 3680 (cond
3679 ((equal tag "Next") Info-next-link-keymap) 3681 ((string-equal (downcase tag) "prev") Info-prev-link-keymap)
3680 ((equal tag "Up") Info-up-link-keymap)))))) 3682 ((string-equal (downcase tag) "next") Info-next-link-keymap)
3683 ((string-equal (downcase tag) "up" ) Info-up-link-keymap))))))
3681 (when Info-use-header-line 3684 (when Info-use-header-line
3682 (goto-char (point-min)) 3685 (goto-char (point-min))
3683 (let* ((header-end (line-end-position)) 3686 (let* ((header-end (line-end-position))