From: Juri Linkov Date: Sun, 18 Nov 2007 12:48:32 +0000 (+0000) Subject: (texinfo-format-printindex): Collect combined indexes X-Git-Tag: emacs-pretest-23.0.90~9653 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=71f89cd9525a8f271e09eb7a1eac87ff01319110;p=emacs.git (texinfo-format-printindex): Collect combined indexes using texinfo-short-index-format-cmds-alist. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 94bc86ce1a1..63dee8f6e0d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2007-11-18 Shigeru Fukaya (tiny change) + + * textmodes/texinfmt.el (texinfo-format-printindex): Collect + combined indexes using texinfo-short-index-format-cmds-alist. + Reported on . + 2007-11-18 Michael Albinus * net/tramp.el (tramp-completion-reread-directory-timeout): New diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el index 73b6ec3920e..55e7134f87e 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))))