[Emacs-diffs] Changes to emacs/lisp/info.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/06/14 16:01:39

Index: info.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/info.el,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -b -r1.534 -r1.535
--- info.el     14 Jun 2008 01:59:21 -0000      1.534
+++ info.el     14 Jun 2008 16:01:38 -0000      1.535
@@ -3723,9 +3723,12 @@
     (unwind-protect
         (while (and (not (equal "Top" Info-current-node)) (> depth 0))
           (let ((up (Info-extract-pointer "up")))
+            (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)))
+              (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) "...")