From: David Reitter <david.reitter@gmail.com>
Date: Mon, 20 Oct 2008 02:23:01 +0000 (+0000)
Subject: Info-mode: Do not remove an existing header line if `Info-use-header-line' is nil.
X-Git-Tag: emacs-pretest-23.0.90~2345
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eb033d40ca4bc829a17449cd20d168dbc169265a;p=emacs.git

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 1d8460ee6aa..78e3f2ef70c 100644
--- 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)