From: Glenn Morris <rgm@gnu.org>
Date: Sat, 4 Jan 2014 03:18:33 +0000 (-0800)
Subject: * admin/admin.el (manual-html-fix-index-2): Fix minor Texinfo 4 issue
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~75
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a71324ccb69f9e3af5b1c613a60111c8f3885ce0;p=emacs.git

* admin/admin.el (manual-html-fix-index-2): Fix minor Texinfo 4 issue
with start of detailed menu.
---

diff --git a/admin/ChangeLog b/admin/ChangeLog
index d43c95d386b..690689012b0 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -2,6 +2,7 @@
 
 	* admin.el (manual-html-fix-node-div): Handle Texinfo 5's movable <hr>.
 	(manual-html-fix-index-2): Tweak Texinfo 5 table format.
+	Fix minor Texinfo 4 issue with start of detailed menu.
 
 2014-01-03  Glenn Morris  <rgm@gnu.org>
 
diff --git a/admin/admin.el b/admin/admin.el
index 8f21cedfce5..847a06e35d1 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -508,9 +508,6 @@ style=\"text-align:left\">")
 		 ;; The Emacs and Elisp manual have some text at the
 		 ;; start of the detailed menu that is not part of the menu.
 		 ;; Other manuals do not.
-		 ;; FIXME Texinfo 4 branch does not handle this correctly.
-		 ;; See eg s/emacs/manual/html_node/eintr/index.html
-		 ;; start of "Detailed Node Listing".
 		 (if (re-search-forward "in one step:" (line-end-position 3) t)
 		     (forward-line 1))
 		 (insert "</p>\n")
@@ -568,7 +565,12 @@ style=\"text-align:left\">")
 	  (replace-match "  </td></tr></table>\n
 <h3>Detailed Node Listing</h3>\n\n" t t)
 	  (search-forward "<p>")
-	  (search-forward "<p>" nil t)
+	  ;; FIXME Fragile!
+	  ;; The Emacs and Elisp manual have some text at the
+	  ;; start of the detailed menu that is not part of the menu.
+	  ;; Other manuals do not.
+	  (if (looking-at "Here are some other nodes")
+	      (search-forward "<p>"))
 	  (goto-char (match-beginning 0))
 	  (skip-chars-backward "\n ")
 	  (setq open-td nil)