[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r115811: * admin.el (manual-html-fix-headers, manual
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] trunk r115811: * admin.el (manual-html-fix-headers, manual-html-fix-index-1): |
|
Date: |
Mon, 30 Dec 2013 18:58:20 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 115811
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2013-12-30 10:58:16 -0800
message:
* admin.el (manual-html-fix-headers, manual-html-fix-index-1):
Some updates for changes in Texinfo 5 output.
modified:
admin/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-2226
admin/admin.el admin.el-20091113204419-o5vbwnq5f7feedwu-2254
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2013-12-29 05:18:15 +0000
+++ b/admin/ChangeLog 2013-12-30 18:58:16 +0000
@@ -1,3 +1,8 @@
+2013-12-30 Glenn Morris <address@hidden>
+
+ * admin.el (manual-html-fix-headers, manual-html-fix-index-1):
+ Some updates for changes in Texinfo 5 output.
+
2013-12-29 Xue Fuqiao <address@hidden>
* make-emacs:
=== modified file 'admin/admin.el'
--- a/admin/admin.el 2013-12-29 05:18:15 +0000
+++ b/admin/admin.el 2013-12-30 18:58:16 +0000
@@ -395,20 +395,25 @@
(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 @@
(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))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r115811: * admin.el (manual-html-fix-headers, manual-html-fix-index-1):,
Glenn Morris <=