summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2015-04-18 14:30:32 -0700
committerGlenn Morris <rgm@gnu.org>2015-04-18 14:30:32 -0700
commit2c38f1358250afa1393d08ec5cec3ade80d5ea0f (patch)
tree953f02266772a3d7576d3d02b627cdd7ebf15ed7 /admin
parentb210cb55b3fcf83f3a8fe2f24116694cc825ffe0 (diff)
downloademacs-2c38f1358250afa1393d08ec5cec3ade80d5ea0f.tar.gz
* admin/admin.el (make-manuals): Add emacs-xtra in pdf and ps.
Diffstat (limited to 'admin')
-rw-r--r--admin/admin.el13
1 files changed, 9 insertions, 4 deletions
diff --git a/admin/admin.el b/admin/admin.el
index f7b915509fb..93e9124ce8d 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -199,6 +199,7 @@ Optional argument TYPE is type of output (nil means all)."
(ps-dir (expand-file-name "ps" dest))
(pdf-dir (expand-file-name "pdf" dest))
(emacs (expand-file-name "doc/emacs/emacs.texi" root))
+ (emacs-xtra (expand-file-name "doc/emacs/emacs-xtra.texi" root))
(elisp (expand-file-name "doc/lispref/elisp.texi" root))
(eintr (expand-file-name "doc/lispintro/emacs-lisp-intro.texi" root))
(misc (manual-misc-manuals root)))
@@ -212,10 +213,14 @@ Optional argument TYPE is type of output (nil means all)."
(manual-html-node emacs (expand-file-name "emacs" html-node-dir)))
(if (member type '(nil "emacs" "emacs-mono"))
(manual-html-mono emacs (expand-file-name "emacs.html" html-mono-dir)))
- (if (member type '(nil "emacs" "emacs-pdf" "pdf"))
- (manual-pdf emacs (expand-file-name "emacs.pdf" pdf-dir)))
- (if (member type '(nil "emacs" "emacs-ps" "ps"))
- (manual-ps emacs (expand-file-name "emacs.ps" ps-dir)))
+ (when (member type '(nil "emacs" "emacs-pdf" "pdf"))
+ (manual-pdf emacs (expand-file-name "emacs.pdf" pdf-dir))
+ ;; emacs-xtra exists only in pdf/ps format.
+ ;; In other formats it is included in the Emacs manual.
+ (manual-pdf emacs-xtra (expand-file-name "emacs-xtra.pdf" pdf-dir)))
+ (when (member type '(nil "emacs" "emacs-ps" "ps"))
+ (manual-ps emacs (expand-file-name "emacs.ps" ps-dir))
+ (manual-ps emacs-xtra (expand-file-name "emacs-xtra.ps" ps-dir)))
(if (member type '(nil "elisp" "elisp-node"))
(manual-html-node elisp (expand-file-name "elisp" html-node-dir)))
(if (member type '(nil "elisp" "elisp-mono"))