branch: externals/auctex
commit a3c343654c197a4b3f23b0687655528dfc125cf4
Author: Ikumi Keita <ik...@ikumi.que.jp>
Commit: Ikumi Keita <ik...@ikumi.que.jp>
Commit for Texinfo mode
* tex-info.el:
* tex-fold.el:
* tex.el:
* .dir-locals.el:
Change major mode name.
texinfo-mode -> Texinfo-mode
Also, discard mode name TeX-texinfo-mode.
---
.dir-locals.el | 2 +-
tex-fold.el | 8 ++++----
tex-info.el | 6 ++----
tex.el | 44 ++++++++++++++++++++++----------------------
4 files changed, 29 insertions(+), 31 deletions(-)
diff --git a/.dir-locals.el b/.dir-locals.el
index 58cf88a2aa..2e19675b51 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -12,7 +12,7 @@
(electric-quote-comment . nil)
(electric-quote-string . nil)
(indent-tabs-mode . nil)))
- (texinfo-mode . ((mode . bug-reference-prog)
+ (Texinfo-mode . ((mode . bug-reference-prog)
(electric-quote-comment . nil)
(electric-quote-string . nil)
(fill-column . 74))))
diff --git a/tex-fold.el b/tex-fold.el
index fddd0af91a..12d72f80c0 100644
--- a/tex-fold.el
+++ b/tex-fold.el
@@ -327,7 +327,7 @@ for macros and `math' for math macros."
(concat (regexp-quote TeX-esc)
"start" (regexp-opt item-list t)))
((and (eq type 'env)
- (eq major-mode 'texinfo-mode))
+ (eq major-mode 'Texinfo-mode))
(concat (regexp-quote TeX-esc)
(regexp-opt item-list t)))
((eq type 'env)
@@ -426,7 +426,7 @@ Return non-nil if an item was found and folded, nil
otherwise."
(save-excursion
(ConTeXt-find-matching-start) (point)))
((and (eq type 'env)
- (eq major-mode 'texinfo-mode))
+ (eq major-mode 'Texinfo-mode))
(save-excursion
(Texinfo-find-env-start) (point)))
((eq type 'env)
@@ -445,7 +445,7 @@ Return non-nil if an item was found and folded, nil
otherwise."
(concat (regexp-quote TeX-esc)
"start\\([A-Za-z]+\\)"))
((and (eq type 'env)
- (eq major-mode 'texinfo-mode))
+ (eq major-mode 'Texinfo-mode))
(concat (regexp-quote TeX-esc)
"\\([A-Za-z]+\\)"))
((eq type 'env)
@@ -535,7 +535,7 @@ TYPE can be either `env' for environments, `macro' for
macros or
(ConTeXt-find-matching-stop)
(point))
((and (eq type 'env)
- (eq major-mode 'texinfo-mode))
+ (eq major-mode 'Texinfo-mode))
(goto-char (1+ start))
(Texinfo-find-env-end)
(point))
diff --git a/tex-info.el b/tex-info.el
index 8bef02a16b..10ea33a82e 100644
--- a/tex-info.el
+++ b/tex-info.el
@@ -549,7 +549,7 @@ is assumed by default."
(easy-menu-define Texinfo-command-menu
Texinfo-mode-map
"Menu used in Texinfo mode for external commands."
- (TeX-mode-specific-command-menu 'texinfo-mode))
+ (TeX-mode-specific-command-menu 'Texinfo-mode))
(easy-menu-define Texinfo-mode-menu
Texinfo-mode-map
@@ -627,11 +627,9 @@ is assumed by default."
;;; Mode:
-;;;###autoload
-(defalias 'Texinfo-mode #'texinfo-mode)
;;;###autoload
-(defun TeX-texinfo-mode ()
+(defun Texinfo-mode ()
"Major mode in AUCTeX for editing Texinfo files.
Special commands:
diff --git a/tex.el b/tex.el
index eddac66f87..512f9ca67b 100644
--- a/tex.el
+++ b/tex.el
@@ -183,15 +183,15 @@ If nil, none is specified."
(defcustom TeX-command-list
'(("TeX" "%(PDF)%(tex) %(file-line-error) %`%(extraopts)
%S%(PDFout)%(mode)%' %(output-dir) %t"
TeX-run-TeX nil
- (plain-TeX-mode AmSTeX-mode texinfo-mode) :help "Run plain TeX")
+ (plain-TeX-mode AmSTeX-mode Texinfo-mode) :help "Run plain TeX")
("LaTeX" "%`%l%(mode)%' %T"
TeX-run-TeX nil
(latex-mode doctex-mode) :help "Run LaTeX")
;; Not part of standard TeX.
("Makeinfo" "makeinfo %(extraopts) %(o-dir) %t" TeX-run-compile nil
- (texinfo-mode) :help "Run Makeinfo with Info output")
+ (Texinfo-mode) :help "Run Makeinfo with Info output")
("Makeinfo HTML" "makeinfo %(extraopts) %(o-dir) --html %t"
TeX-run-compile nil
- (texinfo-mode) :help "Run Makeinfo with HTML output")
+ (Texinfo-mode) :help "Run Makeinfo with HTML output")
("AmSTeX" "amstex %(PDFout) %`%(extraopts) %S%(mode)%' %(output-dir) %t"
TeX-run-TeX nil (AmSTeX-mode) :help "Run AMSTeX")
;; support for ConTeXt --pg
@@ -202,50 +202,50 @@ If nil, none is specified."
TeX-run-TeX nil
(context-mode) :help "Run ConTeXt until completion")
("BibTeX" "bibtex %(O?aux)" TeX-run-BibTeX nil
- (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode texinfo-mode
+ (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode Texinfo-mode
context-mode)
:help "Run BibTeX")
("Biber" "biber %(output-dir) %s" TeX-run-Biber nil
- (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode texinfo-mode)
+ (plain-TeX-mode latex-mode doctex-mode AmSTeX-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")
+ (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")
+ (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"
:visible TeX-queue-command)
("File" "%(o?)dvips %d -o %f " TeX-run-dvips t
- (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode texinfo-mode)
+ (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode Texinfo-mode)
:help "Generate PostScript file")
("Dvips" "%(o?)dvips %d -o %f " TeX-run-dvips nil
- (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode texinfo-mode)
+ (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode Texinfo-mode)
:help "Convert DVI file to PostScript")
("Dvipdfmx" "dvipdfmx -o %(O?pdf) %d" TeX-run-dvipdfmx nil
- (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode texinfo-mode)
+ (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode Texinfo-mode)
:help "Convert DVI file to PDF with dvipdfmx")
("Ps2pdf" "ps2pdf %f %(O?pdf)" TeX-run-ps2pdf nil
- (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode texinfo-mode)
+ (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode Texinfo-mode)
:help "Convert PostScript file to PDF")
("Glossaries" "makeglossaries %(d-dir) %s" TeX-run-command nil
- (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode texinfo-mode)
+ (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode Texinfo-mode)
:help "Run makeglossaries to create glossary file")
("Index" "makeindex %(O?idx)" TeX-run-index nil
- (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode texinfo-mode)
+ (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode Texinfo-mode)
:help "Run makeindex to create index file")
("upMendex" "upmendex %(O?idx)" TeX-run-index t
- (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode texinfo-mode)
+ (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode Texinfo-mode)
:help "Run upmendex to create index file")
("Xindy" "texindy %s" TeX-run-command nil
- (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode texinfo-mode)
+ (plain-TeX-mode latex-mode doctex-mode AmSTeX-mode Texinfo-mode)
:help "Run xindy to create index file")
("Check" "lacheck %s" TeX-run-compile nil (latex-mode)
:help "Check LaTeX file for correctness")
@@ -350,7 +350,7 @@ Any additional elements get just transferred to the
respective menu entries."
(const :tag "LaTeX" latex-mode)
(const :tag "DocTeX" doctex-mode)
(const :tag "ConTeXt" context-mode)
- (const :tag "Texinfo" texinfo-mode)
+ (const :tag "Texinfo" Texinfo-mode)
(const :tag "AmSTeX" AmSTeX-mode)))
(repeat :tag "Menu elements" :inline t sexp))))
@@ -995,7 +995,7 @@ If no mode is given the current major mode is used."
(latex-mode . "LaTeX")
(AmSTeX-mode . "AmSTeX")
(doctex-mode . "docTeX")
- (texinfo-mode . "Texinfo")
+ (Texinfo-mode . "Texinfo")
(context-mode . "ConTeXt")))))
;;; Viewing
@@ -2466,7 +2466,7 @@ Get `major-mode' from master file and enable it."
(TeX-master-file TeX-default-extension))
major-mode)
major-mode))
- (comment-prefix (cond ((eq mode 'texinfo-mode) "@c ")
+ (comment-prefix (cond ((eq mode 'Texinfo-mode) "@c ")
((eq mode 'doctex-mode) "% ")
(t "%%% ")))
(mode-string (concat (and (boundp 'japanese-TeX-mode)
japanese-TeX-mode
@@ -5522,7 +5522,7 @@ reset to \" \"."
;; Preset mode-dependent syntax entries. (Mode-independent entries
;; are set when the variable `TeX-search-syntax-table' is created.)
(modify-syntax-entry (string-to-char TeX-esc) "\\" TeX-search-syntax-table)
- (unless (eq major-mode 'texinfo-mode)
+ (unless (eq major-mode 'Texinfo-mode)
(modify-syntax-entry ?\% "<" TeX-search-syntax-table))
;; Clean up the entries which can be specified as arguments.
(dolist (elt char-syntax-alist)
@@ -6465,16 +6465,16 @@ enter the number of the file to view, anything else to
skip: ") list)))
(info-lookup->completions 'symbol 'latex-mode)))
(lambda (doc)
(info-lookup-symbol (concat "\\" doc) 'latex-mode)))
- (texinfo-info (texinfo-mode)
+ (texinfo-info (Texinfo-mode)
(lambda ()
(mapcar (lambda (x)
(let ((x (car x)))
(if (string-match "\\`@" x)
(substring x 1) x)))
(info-lookup->completions 'symbol
- 'texinfo-mode)))
+ 'Texinfo-mode)))
(lambda (doc)
- (info-lookup-symbol (concat "@" doc) 'texinfo-mode))))
+ (info-lookup-symbol (concat "@" doc) 'Texinfo-mode))))
"Alist of backends used for looking up documentation.
Each item consists of four elements.
