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

[Eli Zaretskii]

Index: emacs/lisp/info.el
diff -c emacs/lisp/info.el:1.288 emacs/lisp/info.el:1.289
*** emacs/lisp/info.el:1.288    Sun Dec  2 23:26:43 2001
--- emacs/lisp/info.el  Fri Dec 21 13:37:00 2001
***************
*** 999,1005 ****
        (if Info-fontify (Info-fontify-node))
        (if Info-use-header-line
            (Info-setup-header-line)
!         (setq Info-header-line nil))
        (run-hooks 'Info-selection-hook)))))
  
  (defun Info-set-mode-line ()
--- 999,1006 ----
        (if Info-fontify (Info-fontify-node))
        (if Info-use-header-line
            (Info-setup-header-line)
!         (setq Info-header-line nil)
!         (setq header-line-format nil)) ; so the header line isn't displayed
        (run-hooks 'Info-selection-hook)))))
  
  (defun Info-set-mode-line ()
***************
*** 2599,2613 ****
                                   'help-echo
                                   (concat "Go to node "
                                           (buffer-substring nbeg nend)))
!               (let ((fun (cdr (assoc tag '(("Prev" . Info-prev)
!                                            ("Next" . Info-next)
!                                            ("Up" . Info-up))))))
!                 (when fun
!                   (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)
--- 2600,2617 ----
                                   'help-echo
                                   (concat "Go to node "
                                           (buffer-substring nbeg nend)))
!               ;; Don't bind mouse events on the header line if we
!               ;; aren't going to display the header line.
!               (when Info-use-header-line
!                 (let ((fun (cdr (assoc tag '(("Prev" . Info-prev)
!                                              ("Next" . Info-next)
!                                              ("Up" . Info-up))))))
!                   (when fun
!                     (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)