Info-mode: Do not remove an existing header line if `Info-use-header-line' is nil.

diff --git a/lisp/info.el b/lisp/info.el
index 1d8460ee6aa3f8ade5012e41eccf052962a02646..78e3f2ef70cdab33663d6857616284e812f6c479 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3512,10 +3512,9 @@ Advanced commands:
   (make-local-variable 'Info-history)
   (make-local-variable 'Info-history-forward)
   (make-local-variable 'Info-index-alternatives)
-  (setq header-line-format
-       (if Info-use-header-line
-           '(:eval (get-text-property (point-min) 'header-line))
-         nil)) ; so the header line isn't displayed
+  (if Info-use-header-line    ; do not override global header lines
+      (setq header-line-format
+           '(:eval (get-text-property (point-min) 'header-line))))
   (set (make-local-variable 'tool-bar-map) info-tool-bar-map)
   ;; This is for the sake of the invisible text we use handling titles.
   (make-local-variable 'line-move-ignore-invisible)