From: Glenn Morris Date: Sat, 18 Apr 2015 21:30:32 +0000 (-0700) Subject: * admin/admin.el (make-manuals): Add emacs-xtra in pdf and ps. X-Git-Tag: emacs-25.0.90~2375 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2c38f1358250afa1393d08ec5cec3ade80d5ea0f;p=emacs.git * admin/admin.el (make-manuals): Add emacs-xtra in pdf and ps. --- 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"))