]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1b7259f)
* admin.el (manual-html-fix-headers, manual-html-fix-index-1):
authorGlenn Morris <rgm@gnu.org>
Mon, 30 Dec 2013 18:58:16 +0000 (10:58 -0800)
committerGlenn Morris <rgm@gnu.org>
Mon, 30 Dec 2013 18:58:16 +0000 (10:58 -0800)
Some updates for changes in Texinfo 5 output.

admin/ChangeLog patch | blob | history
admin/admin.el patch | blob | history

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 877c813513ca631615b1449cfd0b90f883d39bd6..1fbff400acd223de24031b27411ff24469a3eff8 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-30  Glenn Morris  <rgm@gnu.org>
+
+       * admin.el (manual-html-fix-headers, manual-html-fix-index-1):
+       Some updates for changes in Texinfo 5 output.
+
 2013-12-29  Xue Fuqiao  <xfq.free@gmail.com>
 
        * make-emacs:
diff --git a/admin/admin.el b/admin/admin.el
index 571bd8241436c7aae64a3a1fe3c87a95573f6c89..f178ef61f16245df3b2359be5c374a9e184231a1 100644 (file)
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -395,20 +395,25 @@ the @import directive."
 
 (defun manual-html-fix-headers ()
   "Fix up HTML headers for the Emacs manual in the current buffer."
-  (let (opoint)
-    (insert manual-doctype-string)
+  (let ((texi5 (search-forward "<!DOCTYPE" nil t))
+       opoint)
+    ;; Texinfo 5 supplies a DOCTYPE.
+    (or texi5
+       (insert manual-doctype-string))
     (search-forward "<head>\n")
     (insert manual-meta-string)
     (search-forward "<meta")
     (setq opoint (match-beginning 0))
-    (re-search-forward "<!--")
+    (unless texi5
+      (search-forward "<!--")
     (goto-char (match-beginning 0))
     (delete-region opoint (point))
-    (insert manual-style-string)
     (search-forward "<meta http-equiv=\"Content-Style")
-    (setq opoint (match-beginning 0))
+      (setq opoint (match-beginning 0)))
     (search-forward "</head>")
-    (delete-region opoint (match-beginning 0))))
+    (goto-char (match-beginning 0))
+    (delete-region opoint (point))
+    (insert manual-style-string)))
 
 (defun manual-html-fix-node-div ()
   "Fix up HTML \"node\" divs in the current buffer."
@@ -426,7 +431,7 @@ the @import directive."
 
 (defun manual-html-fix-index-1 ()
   (let (opoint)
-    (re-search-forward "<body>\n")
+    (re-search-forward "<body.*>\n")
     (setq opoint (match-end 0))
     (search-forward "<h2 class=\"")
     (goto-char (match-beginning 0))
Unnamed repository; edit this file 'description' to name the repository.