(Info-insert-breadcrumbs): Don't break in apropos and toc.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d6fbb22e0c69313bdc6a8810e7403535870dcbc8..f686fb603226bc2e2ccebd82c9b4ea397cdbe1a3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * info.el (Info-insert-breadcrumbs): Don't break in apropos and toc.
+
 2008-06-14  Martin Rudalics  <rudalics@gmx.at>
 
        * window.el (window--even-window-heights): Even window heights

diff --git a/lisp/info.el b/lisp/info.el
index b274c8258a4fcf391c1ddd091e018b52115fdd1f..fcdee4b660ff5a095a0cc72a8aa56e062a1ff40f 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -3723,9 +3723,12 @@ the variable `Info-file-list-for-emacs'."
     (unwind-protect
         (while (and (not (equal "Top" Info-current-node)) (> depth 0))
           (let ((up (Info-extract-pointer "up")))
-            (push up crumbs)
-            (setq depth (1- depth))
-            (Info-find-node Info-current-file up 'no-going-back)))
+            (if (string-match "\\`(.*)" up)
+                ;; Crossing over to another manual.  This is typically (dir).
+                (setq depth 0)
+              (push up crumbs)
+              (setq depth (1- depth))
+              (Info-find-node Info-current-file up 'no-going-back))))
       (if crumbs                  ;Do bother going back if we haven't moved.
           (Info-find-node Info-current-file onode 'no-going-back))
       ;; Add bottom node.
@@ -3743,7 +3746,10 @@ the variable `Info-file-list-for-emacs'."
           (let ((text
                  (if (not (equal node "Top")) node
                      (format "(%s)Top"
-                             (file-name-nondirectory Info-current-file)))))
+                             (if (stringp Info-current-file)
+                                 (file-name-nondirectory Info-current-file)
+                               ;; Can be `toc', `apropos', or even `history'.
+                               Info-current-file)))))
             (insert (if (bolp) "> " " > ")
                     (cond
                      ((null node) "...")