(texinfo-format-printindex): Collect combined indexes

using texinfo-short-index-format-cmds-alist.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 94bc86ce1a12019cc53c0c559710460ea9ac8801..63dee8f6e0dd85d9b37f1f33159a72bcc5d7157f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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>
 
        * net/tramp.el (tramp-completion-reread-directory-timeout): New

diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 73b6ec3920e69c784f9b22e92327a38c6b72c6ca..55e7134f87e6265ec41df112caa86c8c986b91a5 100644 (file)
--- 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))))