1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-16 09:50:25 +00:00

(texinfo-format-printindex): Collect combined indexes

using texinfo-short-index-format-cmds-alist.
This commit is contained in:
Juri Linkov 2007-11-18 12:48:32 +00:00
parent b048d47875
commit 71f89cd952
2 changed files with 14 additions and 5 deletions

View File

@ -1,3 +1,9 @@
2007-11-18 Shigeru Fukaya <shigeru.fukaya@gmail.com> (tiny change)
* textmodes/texinfmt.el (texinfo-format-printindex): Collect
combined indexes using texinfo-short-index-format-cmds-alist.
Reported on <bug-texinfo@gnu.org>.
2007-11-18 Michael Albinus <michael.albinus@gmx.de> 2007-11-18 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-completion-reread-directory-timeout): New * net/tramp.el (tramp-completion-reread-directory-timeout): New

View File

@ -3001,14 +3001,17 @@ Default is to leave paragraph indentation as is."
(put 'printindex 'texinfo-format 'texinfo-format-printindex) (put 'printindex 'texinfo-format 'texinfo-format-printindex)
(defun texinfo-format-printindex () (defun texinfo-format-printindex ()
(let ((indexelts (symbol-value (let* ((arg (texinfo-parse-arg-discard))
(cdr (assoc (texinfo-parse-arg-discard) (fmt (cdr (assoc arg texinfo-short-index-format-cmds-alist)))
texinfo-indexvar-alist)))) (index-list (delq nil (mapcar (lambda (e)
opoint) (and (eq fmt (get (cdr e) 'texinfo-format))
(cdr (assoc (car e) texinfo-indexvar-alist))))
texinfo-short-index-cmds-alist)))
(indexelts (apply #'append nil (mapcar #'symbol-value index-list)))
opoint)
(insert "\n* Menu:\n\n") (insert "\n* Menu:\n\n")
(setq opoint (point)) (setq opoint (point))
(texinfo-print-index nil indexelts) (texinfo-print-index nil indexelts)
(if (memq system-type '(vax-vms windows-nt ms-dos)) (if (memq system-type '(vax-vms windows-nt ms-dos))
(texinfo-sort-region opoint (point)) (texinfo-sort-region opoint (point))
(shell-command-on-region opoint (point) "sort -fd" 1)))) (shell-command-on-region opoint (point) "sort -fd" 1))))