diff options
author | Juri Linkov <[email protected]> | 2007-11-18 12:48:32 +0000 |
---|---|---|
committer | Juri Linkov <[email protected]> | 2007-11-18 12:48:32 +0000 |
commit | 71f89cd9525a8f271e09eb7a1eac87ff01319110 (patch) | |
tree | 222726121e3a14691883480c3c731f2d608dbcc0 /lisp/textmodes | |
parent | b048d47875384535b96cebc34953c280653488f5 (diff) |
(texinfo-format-printindex): Collect combined indexes
using texinfo-short-index-format-cmds-alist.
Diffstat (limited to 'lisp/textmodes')
-rw-r--r-- | lisp/textmodes/texinfmt.el | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index 73b6ec3920..55e7134f87 100644 --- a/lisp/textmodes/texinfmt.el +++ b/lisp/textmodes/texinfmt.el @@ -3001,14 +3001,17 @@ Default is to leave paragraph indentation as is." (put 'printindex 'texinfo-format 'texinfo-format-printindex) (defun texinfo-format-printindex () - (let ((indexelts (symbol-value - (cdr (assoc (texinfo-parse-arg-discard) - texinfo-indexvar-alist)))) - opoint) + (let* ((arg (texinfo-parse-arg-discard)) + (fmt (cdr (assoc arg texinfo-short-index-format-cmds-alist))) + (index-list (delq nil (mapcar (lambda (e) + (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") (setq opoint (point)) (texinfo-print-index nil indexelts) - (if (memq system-type '(vax-vms windows-nt ms-dos)) (texinfo-sort-region opoint (point)) (shell-command-on-region opoint (point) "sort -fd" 1)))) |