aboutsummaryrefslogtreecommitdiffstats
path: root/admin/admin.el
diff options
context:
space:
mode:
authorJoakim Verona2013-06-14 23:54:26 +0200
committerJoakim Verona2013-06-14 23:54:26 +0200
commit2a342ba649407875a265b8d56c9f7c3d87c4b43c (patch)
treed9e2cb1a6c10854cf55a018b14d2b0cef48eafaf /admin/admin.el
parente32984567a0e1c100011adee2311cbc1fdf61433 (diff)
parent230dcbaf2ff0615d72c5d2ca41edb999b6bc1b87 (diff)
downloademacs-2a342ba649407875a265b8d56c9f7c3d87c4b43c.tar.gz
emacs-2a342ba649407875a265b8d56c9f7c3d87c4b43c.zip
Merge branch 'trunk' into xwidget
Diffstat (limited to 'admin/admin.el')
-rw-r--r--admin/admin.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/admin.el b/admin/admin.el
index cb7eaead27f..8366207f5b0 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -271,7 +271,7 @@ Root must be the root of an Emacs source tree."
271<meta name=\"DC.title\" content=\"gnu.org\">\n\n") 271<meta name=\"DC.title\" content=\"gnu.org\">\n\n")
272 272
273(defconst manual-style-string "<style type=\"text/css\"> 273(defconst manual-style-string "<style type=\"text/css\">
274@import url('/style.css');\n</style>\n") 274@import url('/s/emacs/manual.css');\n</style>\n")
275 275
276(defun manual-misc-html (name root html-node-dir html-mono-dir) 276(defun manual-misc-html (name root html-node-dir html-mono-dir)
277 (let ((texi (expand-file-name (format "doc/misc/%s.texi" name) root))) 277 (let ((texi (expand-file-name (format "doc/misc/%s.texi" name) root)))