>From f16fc130a8cfb21b9710ebc8cdadb4dbc05353c2 Mon Sep 17 00:00:00 2001
From: Ikumi Keita <ikumi@ikumi.que.jp>
Date: Wed, 7 Jul 2021 18:06:02 +0900
Subject: [PATCH 1/2] Add entries for Texinfo mode in `TeX-command-list'

* tex.el (TeX-command-list): Add "Texindex" and "Texi2dvi" entries in
`TeX-command-list'.
* doc/auctex.texi (Superseding): Mention "Texindex" instead of "Index".
---
 doc/auctex.texi |  4 +---
 tex.el          | 11 +++++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/doc/auctex.texi b/doc/auctex.texi
index 7459ab6e..c5d36ff8 100644
--- a/doc/auctex.texi
+++ b/doc/auctex.texi
@@ -5973,10 +5973,8 @@ The native Texinfo mode provides the binding @kbd{C-c C-t C-i}
 @kbd{C-c C-t C-p} (@code{texinfo-tex-print}) and @kbd{C-c C-t C-q}
 (@code{tex-show-print-queue}) for printing and showing the printer
 queue.  These are superseded by the respective commands available
-through @kbd{C-c C-c} (@code{TeX-command-master}) in @AUCTeX{}: @samp{Index},
+through @kbd{C-c C-c} (@code{TeX-command-master}) in @AUCTeX{}: @samp{Texindex},
 @samp{Print}, and @samp{Queue}.
-@c FIXME: "Index" runs makeindex, not texindex.  No entry in
-@c TeX-command-list runs texindex.
 
 @item Kill jobs
 The command @kbd{C-c C-t C-k} (@code{tex-kill-job}) in the native mode
diff --git a/tex.el b/tex.el
index 2c5da746..df467de2 100644
--- a/tex.el
+++ b/tex.el
@@ -202,6 +202,17 @@ If nil, none is specified."
     ("Biber" "biber %(output-dir) %s" TeX-run-Biber nil
      (plain-tex-mode latex-mode doctex-mode ams-tex-mode texinfo-mode)
      :help "Run Biber")
+    ;; Not part of standard TeX.
+    ;; It seems that texindex doesn't support "--output-dir" option.
+    ("Texindex" "texindex %s.??" TeX-run-command nil
+     (texinfo-mode) :help "Run Texindex")
+    ;; TODO:
+    ;; 1. Supply "--dvipdf" option if `TeX-PDF-mode' and
+    ;;    `TeX-PDF-from-DVI' are non-nil.
+    ;; 2. Supply "--build-dir=DIR" option when `TeX-output-dir' is
+    ;;    non-nil.
+    ("Texi2dvi" "%(PDF)texi2dvi %t" TeX-run-command nil
+     (texinfo-mode) :help "Run Texi2dvi or Texi2pdf")
     ("View" "%V" TeX-run-discard-or-function t t :help "Run Viewer")
     ("Print" "%p" TeX-run-command t t :help "Print the file")
     ("Queue" "%q" TeX-run-background nil t :help "View the printer queue"
-- 
2.31.1