From 9d1804dcb8b711a6d7eee16f0f54f3d418e2cb53 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 30 Dec 2013 10:58:16 -0800 Subject: [PATCH] * admin.el (manual-html-fix-headers, manual-html-fix-index-1): Some updates for changes in Texinfo 5 output. --- admin/ChangeLog | 5 +++++ admin/admin.el | 19 ++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/admin/ChangeLog b/admin/ChangeLog index 877c813513c..1fbff400acd 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2013-12-30 Glenn Morris + + * admin.el (manual-html-fix-headers, manual-html-fix-index-1): + Some updates for changes in Texinfo 5 output. + 2013-12-29 Xue Fuqiao * make-emacs: diff --git a/admin/admin.el b/admin/admin.el index 571bd824143..f178ef61f16 100644 --- 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 "\n") (insert manual-meta-string) (search-forward "") - (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 "\n") + (re-search-forward "\n") (setq opoint (match-end 0)) (search-forward "