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

[Juri Linkov]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.455 emacs/lisp/info.el:1.456
*** emacs/lisp/info.el:1.455    Tue Nov  1 09:45:10 2005
--- emacs/lisp/info.el  Tue Nov  1 09:55:09 2005
***************
*** 1961,1967 ****
                (if (and (string-equal file curr-file)
                         (string-equal node curr-node))
                    (setq p (point)))
!               (insert "* " node ": (" (file-name-nondirectory file)
                        ")" node ".\n"))
              (setq hl (cdr hl))))))
      (Info-find-node "history" "Top")
--- 1961,1969 ----
                (if (and (string-equal file curr-file)
                         (string-equal node curr-node))
                    (setq p (point)))
!               (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,3668 ****
                   (nend (match-end 2))
                   (tbeg (match-beginning 1))
                   (tag (match-string 1)))
!             (if (string-equal 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)
--- 3664,3670 ----
                   (nend (match-end 2))
                   (tbeg (match-beginning 1))
                   (tag (match-string 1)))
!             (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,3683 ****
                ;; 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))))))
          (when Info-use-header-line
            (goto-char (point-min))
            (let* ((header-end (line-end-position))
--- 3675,3686 ----
                ;; 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
!               ((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))