Mercurial > emacs
changeset 95914:bda6cd3a6477
(Info-insert-breadcrumbs): Don't break in apropos and toc.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sat, 14 Jun 2008 16:01:38 +0000 |
| parents | e9cff1f5a026 |
| children | 80ae3c334377 |
| files | lisp/ChangeLog lisp/info.el |
| diffstat | 2 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Jun 14 10:11:20 2008 +0000 +++ b/lisp/ChangeLog Sat Jun 14 16:01:38 2008 +0000 @@ -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
--- a/lisp/info.el Sat Jun 14 10:11:20 2008 +0000 +++ b/lisp/info.el Sat Jun 14 16:01:38 2008 +0000 @@ -3723,9 +3723,12 @@ (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 @@ (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) "...")