mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-21 03:52:16 -08:00
Code Issues Projects Releases Wiki Activity

(Info-select-node): If Info-use-header-line is nil, set

Browse source 
header-line-format to nil.
(Info-fontify-node): Don't put a keymap text property on the
heading if we are not going to display the header line.  Remove
any such text properties left over from past visits to this node.
This commit is contained in:
Eli Zaretskii 2001-12-21 19:09:21 +00:00
parent 8f2b1272e0
commit bed8fddf33
2 changed files with 28 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

@ -1,3 +1,11 @@
2001-12-21 Eli Zaretskii <eliz@is.elta.co.il>
* info.el (Info-select-node): If Info-use-header-line is nil, set
header-line-format to nil.
(Info-fontify-node): Don't put a keymap text property on the
heading if we are not going to display the header line. Remove
any such text properties left over from past visits to this node.
2001-12-21 Richard M. Stallman <rms@gnu.org>
* emacs-lisp/easy-mmode.el (define-minor-mode):

30
lisp/info.el
View file

@ -1000,7 +1000,8 @@ Bind this in case the user sets it to nil."
(if Info-fontify (Info-fontify-node))
(if Info-use-header-line
(Info-setup-header-line)
(setq Info-header-line nil))
(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 ()
@ -2573,15 +2574,24 @@ the variable `Info-file-list-for-emacs'."
'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))))
))))
;; 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)))))
(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)