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

[Eli Zaretskii]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.289 emacs/lisp/info.el:1.290
*** emacs/lisp/info.el:1.289    Fri Dec 21 13:37:00 2001
--- emacs/lisp/info.el  Fri Dec 21 14:30:00 2001
***************
*** 2578,2585 ****
    ;; Only fontify the node if it hasn't already been done.  [We pass in
    ;; LIMIT arg to `next-property-change' because it seems to search past
    ;; (point-max).]
!   (unless (< (next-property-change (point-min) nil (point-max))
!            (point-max))
      (save-excursion
        (let ((buffer-read-only nil)
            (case-fold-search t))
--- 2578,2592 ----
    ;; Only fontify the node if it hasn't already been done.  [We pass in
    ;; LIMIT arg to `next-property-change' because it seems to search past
    ;; (point-max).]
!   (unless (and (< (next-property-change (point-min) nil (point-max))
!                 (point-max))
!              ;; But do put the text properties if the local-map property
!              ;; is inconsistent with Info-use-header-line's value.
!              (eq
!               (= (next-single-property-change
!                   (point-min) 'local-map nil (point-max))
!                  (point-max))
!               (null Info-use-header-line)))
      (save-excursion
        (let ((buffer-read-only nil)
            (case-fold-search t))
***************
*** 2610,2617 ****
                      (let ((keymap (make-sparse-keymap)))
                        (define-key keymap [header-line down-mouse-1] fun)
                        (define-key keymap [header-line down-mouse-2] fun)
!                       (put-text-property tbeg nend 'local-map keymap))))
!                 )))))
        (goto-char (point-min))
        (while (re-search-forward "\n\\([^ 
\t\n].+\\)\n\\(\\*+\\|=+\\|-+\\|\\.+\\)$"
                                  nil t)
--- 2617,2630 ----
                      (let ((keymap (make-sparse-keymap)))
                        (define-key keymap [header-line down-mouse-1] fun)
                        (define-key keymap [header-line down-mouse-2] fun)
!                       (put-text-property tbeg nend 'local-map keymap)))))
!               (if (not Info-use-header-line)
!                   ;; In case they switched Info-use-header-line off
!                   ;; in the middle of an Info session, some text
!                   ;; properties may have been left lying around from
!                   ;; past visits of this node.  Remove them.
!                   (remove-text-properties tbeg nend '(local-map nil)))
!                 ))))
        (goto-char (point-min))
        (while (re-search-forward "\n\\([^ 
\t\n].+\\)\n\\(\\*+\\|=+\\|-+\\|\\.+\\)$"
                                  nil t)