From 993159761a8d77bd458a8f5841daeffd5f785944 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Tue, 1 Nov 2005 09:56:07 +0000 Subject: [PATCH] (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. --- lisp/ChangeLog | 7 +++++++ lisp/info.el | 17 ++++++++++------- 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 @@ 2005-11-01 Juri Linkov + * info.el (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. + +2005-11-01 Juri Linkov + * info.el (Info-file-supports-index-cookies): New variable. (Info-find-node-2): Check makeinfo version for index cookie support. (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." (if (and (string-equal file curr-file) (string-equal node curr-node)) (setq p (point))) - (insert "* " node ": (" (file-name-nondirectory file) + (insert "* " node ": (" + (propertize (or (file-name-directory file) "") 'invisible t) + (file-name-nondirectory file) ")" node ".\n")) (setq hl (cdr hl)))))) (Info-find-node "history" "Top") @@ -3662,7 +3664,7 @@ the variable `Info-file-list-for-emacs'." (nend (match-end 2)) (tbeg (match-beginning 1)) (tag (match-string 1))) - (if (string-equal tag "Node") + (if (string-equal (downcase tag) "node") (put-text-property nbeg nend 'font-lock-face 'info-header-node) (put-text-property nbeg nend 'font-lock-face 'info-header-xref) (put-text-property tbeg nend 'mouse-face 'highlight) @@ -3673,11 +3675,12 @@ the variable `Info-file-list-for-emacs'." ;; Always set up the text property keymap. ;; It will either be used in the buffer ;; or copied in the header line. - (put-text-property tbeg nend 'keymap - (cond - ((equal tag "Prev") Info-prev-link-keymap) - ((equal tag "Next") Info-next-link-keymap) - ((equal tag "Up") Info-up-link-keymap)))))) + (put-text-property + tbeg nend 'keymap + (cond + ((string-equal (downcase tag) "prev") Info-prev-link-keymap) + ((string-equal (downcase tag) "next") Info-next-link-keymap) + ((string-equal (downcase tag) "up" ) Info-up-link-keymap)))))) (when Info-use-header-line (goto-char (point-min)) (let* ((header-end (line-end-position)) -- 2.11.4.GIT