[Emacs-diffs] /srv/bzr/emacs/trunk r106868: Allow visiting Info files with no "Up" pointer, such as DIR files.

[Eli Zaretskii]

------------------------------------------------------------
revno: 106868
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-01-14 20:16:28 +0200
message:
  Allow visiting Info files with no "Up" pointer, such as DIR files.
  
   lisp/info.el (Info-toc-build): If the Info file has no "Up" pointer,
   don't pass the (nil) value of `upnode' to string-match.
modified:
  lisp/ChangeLog
  lisp/info.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-14 16:09:55 +0000
+++ b/lisp/ChangeLog    2012-01-14 18:16:28 +0000
@@ -1,3 +1,8 @@
+2012-01-14  Eli Zaretskii  <address@hidden>
+
+       * info.el (Info-toc-build): If the Info file has no "Up" pointer,
+       don't pass the (nil) value of `upnode' to string-match.
+
 2012-01-14  Chong Yidong  <address@hidden>
 
        * startup.el (command-line): Fix X resource class for cursorColor.

=== modified file 'lisp/info.el'
--- a/lisp/info.el      2012-01-06 08:10:22 +0000
+++ b/lisp/info.el      2012-01-14 18:16:28 +0000
@@ -2251,7 +2251,7 @@
                              (match-string-no-properties 1)))
                 (section "Top")
                 menu-items)
-           (when (string-match "(" upnode) (setq upnode nil))
+           (when (and upnode (string-match "(" upnode)) (setq upnode nil))
             (when (and (not (Info-index-node nodename file))
                        (re-search-forward "^\\* Menu:" bound t))
               (forward-line 1)