summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2022-05-29 06:30:21 +0200
committerStefan Kangas <stefan@marxist.se>2022-05-29 06:30:21 +0200
commit6303cb7e9ff06e468d970a51cd87ece21d279b56 (patch)
tree4eb4f3ddaa535ed4adfaf584d84c2c9b1b4e50d2 /admin
parentc92d73d271038c93a72c059ed0190bc09b95026d (diff)
parentf9ee83bfb9f09a32ca8c15385f0cd3ec12ebde8c (diff)
downloademacs-6303cb7e9ff06e468d970a51cd87ece21d279b56.tar.gz
Merge from origin/emacs-28
f9ee83bfb9 do_switch_frame: before leaving mini-window, check other (... 908e2e09d0 Fix commands used to produce on-line HTML docs fff770fb97 Fix a bad cross-reference in elisp.pdf ebea3415b0 Fix documentation of 'string-pad'
Diffstat (limited to 'admin')
-rw-r--r--admin/admin.el14
1 files changed, 11 insertions, 3 deletions
diff --git a/admin/admin.el b/admin/admin.el
index 8c68b181831..6be378b9246 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -351,11 +351,13 @@ Optional argument TYPE is type of output (nil means all)."
\"https://www.w3.org/TR/html4/loose.dtd\">\n\n")
(defconst manual-meta-string
- "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">
-<link rev=\"made\" href=\"mailto:bug-gnu-emacs@gnu.org\">
+ "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">\n")
+
+(defconst manual-links-string
+ "<link rev=\"made\" href=\"mailto:bug-gnu-emacs@gnu.org\">
<link rel=\"icon\" type=\"image/png\" href=\"/graphics/gnu-head-mini.png\">
<meta name=\"ICBM\" content=\"42.256233,-71.006581\">
-<meta name=\"DC.title\" content=\"gnu.org\">\n\n")
+<meta name=\"DC.title\" content=\"gnu.org\">\n")
(defconst manual-style-string "<style type=\"text/css\">
@import url('/software/emacs/manual.css');\n</style>\n")
@@ -486,6 +488,12 @@ the @import directive."
(delete-region opoint (point))
(search-forward "<meta http-equiv=\"Content-Style")
(setq opoint (match-beginning 0)))
+ (search-forward "</title>\n")
+ (delete-region opoint (point))
+ (search-forward "<link href=")
+ (goto-char (match-beginning 0))
+ (insert manual-links-string)
+ (setq opoint (point))
(search-forward "</head>")
(goto-char (match-beginning 0))
(delete-region opoint (point))