Fix a bug in texinfo-make-menu.

 lisp/textmodes/texnfo-upd.el (texinfo-specific-section-type): Don't
 recognize a Top node if there are other sectioning commands
 earlier in the Texinfo file.  This fixes a bug in
 texinfo-make-menu and avoids inflooping in
 texinfo-all-menus-update when they are invoked on texinfo.texi.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5ac028e91da5e02db2e0e737a6ae4e3645909527..0620164c6dd063308757717c9c528fdca1fdfc0c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2014-08-21  Eli Zaretskii  <eliz@gnu.org>
+
+       * textmodes/texnfo-upd.el (texinfo-specific-section-type): Don't
+       recognize a Top node if there are other sectioning commands
+       earlier in the Texinfo file.  This fixes a bug in
+       texinfo-make-menu and avoids inflooping in
+       texinfo-all-menus-update when they are invoked on texinfo.texi.
+
 2014-08-21  Martin Rudalics  <rudalics@gmx.at>
 
        * window.el (window--side-window-p): New function.

diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index e345f8a502835c1ad1daf1d4663a9df073ada68e..839d7a96b5dec58d4c5e34f7fec3924a32ade200 100644 (file)
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -1145,24 +1145,40 @@ For example, \"unnumberedsubsec\".  Return \"top\" for top node.
 Searches forward for a section.  Hence, point must be before the
 section whose type will be found.  Does not move point.  Signal an
 error if the node is not the top node and a section is not found."
-  (let ((case-fold-search t))
-    (save-excursion
-      (cond
-       ((re-search-forward "^@node [ \t]*top[ \t]*\\(,\\|$\\)"
-                          ;; Following search limit by cph but causes a bug
-                          ;;(line-end-position)
-                          nil
-                          t)
-       "top")
-       ((re-search-forward texinfo-section-types-regexp nil t)
-       (buffer-substring-no-properties
-        (progn (beginning-of-line) ; copy its name
-               (1+ (point)))
-        (progn (forward-word 1)
-               (point))))
-       (t
-       (error
-        "texinfo-specific-section-type: Chapter or section not found"))))))
+  (let* ((case-fold-search t)
+        ;; The Texinfo manual has a second Top node inside @verbatim
+        ;; near the end, which dupes us into thinking we are at top
+        ;; level, no matter where we are when invoked.  We don't
+        ;; really grok @verbatim, so we cheat: only consider us to be
+        ;; at top level if the position of the Top node we found is
+        ;; before any other sectioning command.
+        (top-pos (save-excursion
+                   (re-search-forward "^@node [ \t]*top[ \t]*\\(,\\|$\\)"
+                                      ;; Following search limit causes a bug
+                                      ;;(line-end-position)
+                                      nil
+                                      t)))
+        (sec-pos (save-excursion
+                   (re-search-forward texinfo-section-types-regexp nil t)))
+        sec-name)
+    (if sec-pos
+       (save-excursion
+         (goto-char sec-pos)
+         (setq sec-name (buffer-substring-no-properties
+                         (progn (beginning-of-line) ; copy its name
+                                (1+ (point)))
+                         (progn (forward-word 1)
+                                (point))))))
+    (cond
+     ((or sec-pos top-pos)
+      (if (and top-pos sec-pos)
+         (if (< top-pos sec-pos)
+             "top"
+           sec-name)
+       (or sec-name "top")))
+     (t
+      (error
+       "texinfo-specific-section-type: Chapter or section not found")))))
 
 (defun texinfo-hierarchic-level ()
   "Return the general hierarchical level of the next node in a texinfo file.