(Info-setup-header-line): If the node header includes

either Next: or Prev: links, don't show the File: and Node: parts
in the header line.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 59e408c7e223995a67044f9ae3b4ad1dd15c6ef0..04549011028d30af693e32c44a3c53cc0fd83ac4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-11  Eli Zaretskii  <eliz@is.elta.co.il>
+
+       * info.el (Info-setup-header-line): If the node header includes
+       either Next: or Prev: links, don't show the File: and Node: parts
+       in the header line.
+
 2001-01-11  Gerd Moellmann  <gerd@gnu.org>
 
        * comint.el (comint-goto-process-mark): Don't print a message

diff --git a/lisp/info.el b/lisp/info.el
index a298607785debbf42ed22d42b897b0acd667a0b7..dc9a7b7dea9f144be4da9f1ad23b24848b67885a 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -984,11 +984,21 @@ Bind this in case the user sets it to nil."
 ;; should be called when the node is already narrowed.
 (defun Info-setup-header-line ()
   (goto-char (point-min))
-  (forward-line 1)
-  (set (make-local-variable 'Info-header-line)
-       (buffer-substring (point-min) (1- (point))))
-  (setq header-line-format 'Info-header-line)
-  (narrow-to-region (point) (point-max)))
+  (let* ((case-fold-search t)
+        (header-end (save-excursion (forward-line 1) (1- (point))))
+        ;; If we find neither Next: nor Prev: link, show the entire
+        ;; node header.  Otherwise, don't show the File: and Node:
+        ;; parts, to avoid wasting precious space on information that
+        ;; is available in the mode line.
+        (header-beg (if (re-search-forward
+                         "\\(next\\|prev[ious]*\\): "
+                         header-end t)
+                        (match-beginning 1)
+                      (point))))
+    (set (make-local-variable 'Info-header-line)
+        (buffer-substring header-beg header-end))
+    (setq header-line-format 'Info-header-line)
+    (narrow-to-region (1+ header-end) (point-max))))
 \f
 ;; Go to an info node specified with a filename-and-nodename string
 ;; of the sort that is found in pointers in nodes.