From 508021c76d19608339c44aca2dbd48856dbde313 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sat, 14 Jun 2008 16:01:38 +0000 Subject: [PATCH] (Info-insert-breadcrumbs): Don't break in apropos and toc. --- lisp/ChangeLog | 4 ++++ lisp/info.el | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d6fbb22e0c6..f686fb60322 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-06-14 Stefan Monnier + + * info.el (Info-insert-breadcrumbs): Don't break in apropos and toc. + 2008-06-14 Martin Rudalics * window.el (window--even-window-heights): Even window heights diff --git a/lisp/info.el b/lisp/info.el index b274c8258a4..fcdee4b660f 100644 --- 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) "...") -- 2.39.2