[elpa] externals/auctex cad3da0 47/62: ; Fix byte-compile warnings in styles

[Tassilo Horn]

branch: externals/auctex
commit cad3da0899757d44f97b8e0bbdb9349471343cf8
Author: Tassilo Horn <tsdh@gnu.org>
Commit: Tassilo Horn <tsdh@gnu.org>

    ; Fix byte-compile warnings in styles
---
 style/makeidx.el    | 39 +++++++++++++++++---------------
 style/marginnote.el |  2 ++
 style/mathtools.el  |  1 +
 style/mdframed.el   |  2 ++
 style/mdsymbol.el   |  3 +++
 style/mdwlist.el    |  3 +++
 style/memoir.el     |  3 +++
 style/menukeys.el   |  1 +
 style/metalogo.el   |  2 ++
 style/mflogo.el     |  2 ++
 style/minted.el     |  1 +
 style/mn2e.el       |  3 +++
 style/mnras.el      |  3 +++
 style/moodle.el     |  3 +++
 style/multicol.el   |  3 +++
 style/multido.el    | 23 ++++++++++---------
 style/multind.el    | 65 ++++++++++++++++++++++++++++-------------------------
 style/multirow.el   |  2 ++
 style/multitoc.el   |  2 ++
 19 files changed, 103 insertions(+), 60 deletions(-)

diff --git a/style/makeidx.el b/style/makeidx.el
index 2c064b6..f233cc0 100644
--- a/style/makeidx.el
+++ b/style/makeidx.el
@@ -24,24 +24,27 @@
 
 ;;; Code:
 
-(TeX-add-style-hook "makeidx"
-  (lambda ()
-    (TeX-add-symbols 
-     "printindex" "indexspace")
-
-    ;; Parsing the default index macro is defined in latex.el
-    ;; The same is true form completion in the index macro
-
-    ;; Completion for the |see macro
-    (setq TeX-complete-list
-         (append
-          '(("|see{\\([^{}\n\r]*\\)" 1 LaTeX-index-entry-list))
-          TeX-complete-list))
-
-    ;; RefTeX support
-    (and (fboundp 'reftex-add-index-macros)
-        (reftex-add-index-macros '(default))))
-  TeX-dialect)
+(require 'tex)
+
+(TeX-add-style-hook
+ "makeidx"
+ (lambda ()
+   (TeX-add-symbols
+    "printindex" "indexspace")
+
+   ;; Parsing the default index macro is defined in latex.el
+   ;; The same is true form completion in the index macro
+
+   ;; Completion for the |see macro
+   (setq TeX-complete-list
+        (append
+         '(("|see{\\([^{}\n\r]*\\)" 1 LaTeX-index-entry-list))
+         TeX-complete-list))
+
+   ;; RefTeX support
+   (and (fboundp 'reftex-add-index-macros)
+       (reftex-add-index-macros '(default))))
+ TeX-dialect)
 
 (defvar LaTeX-makeidx-package-options nil
   "Package options for the makeidx package.")
diff --git a/style/marginnote.el b/style/marginnote.el
index 657faf0..d11927b 100644
--- a/style/marginnote.el
+++ b/style/marginnote.el
@@ -31,6 +31,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/mathtools.el b/style/mathtools.el
index c8693d5..d4b266c 100644
--- a/style/mathtools.el
+++ b/style/mathtools.el
@@ -38,6 +38,7 @@
 
 ;; Needed for auto-parsing:
 (require 'tex)
+(require 'latex)
 
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
diff --git a/style/mdframed.el b/style/mdframed.el
index 41c9cd5..8dfb9a5 100644
--- a/style/mdframed.el
+++ b/style/mdframed.el
@@ -37,6 +37,8 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
 ;; Needed for compiling `cl-pushnew':
 (eval-when-compile
   (require 'cl-lib))
diff --git a/style/mdsymbol.el b/style/mdsymbol.el
index be8fcd5..d82f87e 100644
--- a/style/mdsymbol.el
+++ b/style/mdsymbol.el
@@ -32,6 +32,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 (TeX-add-style-hook
  "mdsymbol"
  (lambda ()
diff --git a/style/mdwlist.el b/style/mdwlist.el
index 6273aca..2c4b067 100644
--- a/style/mdwlist.el
+++ b/style/mdwlist.el
@@ -28,6 +28,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/memoir.el b/style/memoir.el
index 878aa2c..7945bc0 100644
--- a/style/memoir.el
+++ b/style/memoir.el
@@ -32,6 +32,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 (TeX-add-style-hook
  "memoir"
  (lambda ()
diff --git a/style/menukeys.el b/style/menukeys.el
index 09f45ec..7d68097 100644
--- a/style/menukeys.el
+++ b/style/menukeys.el
@@ -33,6 +33,7 @@
 
 ;; Needed for auto-parsing:
 (require 'tex)
+(require 'latex)
 
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
diff --git a/style/metalogo.el b/style/metalogo.el
index 27d5714..04d2cfb 100644
--- a/style/metalogo.el
+++ b/style/metalogo.el
@@ -29,6 +29,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/mflogo.el b/style/mflogo.el
index 7c33735..f7b1c5e 100644
--- a/style/mflogo.el
+++ b/style/mflogo.el
@@ -30,6 +30,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/minted.el b/style/minted.el
index 56a3a09..7c7c33e 100644
--- a/style/minted.el
+++ b/style/minted.el
@@ -31,6 +31,7 @@
 ;;; Code:
 
 (require 'tex)
+(require 'latex)
 
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
diff --git a/style/mn2e.el b/style/mn2e.el
index 406ed97..2aa6937 100644
--- a/style/mn2e.el
+++ b/style/mn2e.el
@@ -29,6 +29,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/mnras.el b/style/mnras.el
index a55ea16..95294bc 100644
--- a/style/mnras.el
+++ b/style/mnras.el
@@ -29,6 +29,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/moodle.el b/style/moodle.el
index 2130321..c7dfeec 100644
--- a/style/moodle.el
+++ b/style/moodle.el
@@ -35,6 +35,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/multicol.el b/style/multicol.el
index 661725a..46b476c 100644
--- a/style/multicol.el
+++ b/style/multicol.el
@@ -30,6 +30,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 (TeX-add-style-hook
  "multicol"
  (lambda ()
diff --git a/style/multido.el b/style/multido.el
index 8de226f..ec92edc 100644
--- a/style/multido.el
+++ b/style/multido.el
@@ -35,19 +35,20 @@
 
 ;;; Code:
 
+(require 'tex)
+
 (TeX-add-style-hook
  "multido"
- (function
-  (lambda ()
-    (TeX-add-symbols
-     '("multido" "\var=<start value>+-<inc>" "Repititions" t)
-     '("Multido" "\var=<start value>+-<inc>" "Repititions" t)
-     '("mmultido" "\var=<start value>+-<inc>" "Repititions" t)
-     '("MMultido" "\var=<start value>+-<inc>" "Repititions" t)
-     "multidostop"
-     "multidocount"
-     '("fpAdd" "Summand 1" "Summand 2" "Register")
-     '("fpSub" "Minuend" "Subtrahend" "Register"))))
+ (lambda ()
+   (TeX-add-symbols
+    '("multido" "\var=<start value>+-<inc>" "Repititions" t)
+    '("Multido" "\var=<start value>+-<inc>" "Repititions" t)
+    '("mmultido" "\var=<start value>+-<inc>" "Repititions" t)
+    '("MMultido" "\var=<start value>+-<inc>" "Repititions" t)
+    "multidostop"
+    "multidocount"
+    '("fpAdd" "Summand 1" "Summand 2" "Register")
+    '("fpSub" "Minuend" "Subtrahend" "Register")))
  TeX-dialect)
 
 ;;; multido.el ends here
diff --git a/style/multind.el b/style/multind.el
index 5c27c34..7162eed 100644
--- a/style/multind.el
+++ b/style/multind.el
@@ -24,37 +24,40 @@
 
 ;;; Code:
 
-(TeX-add-style-hook "multind"
-  (lambda ()
-
-    ;; Commands
-    (TeX-add-symbols
-     '("makeindex" "Indextag")
-     '("index" TeX-arg-index-tag TeX-arg-index)
-     '("printindex" TeX-arg-index-tag "Title")
-     "printindex" "indexspace")
-
-    ;; Parsing index macros
-    (setq LaTeX-auto-regexp-list
-         (append
-          ;; The first regexp is faster, but less accurate
-          ;; '(("\\\\index\\*?{[^{}]*}{\\([^}]*\\)" 1 LaTeX-auto-index-entry))
-          ;; The second regexp is very good, but slower
-          
'(("\\\\index\\*?{[^{}]*}{\\([^}{]*\\({[^}{]*\\({[^}{]*\\({[^}{]*}[^}{]*\\)*}[^}{]*\\)*}[^}{]*\\)*\\)}"
-             1 LaTeX-auto-index-entry))
-          LaTeX-auto-regexp-list))
-
-    ;; Completion for index entries in the |see and \index commands
-    (setq TeX-complete-list 
-         (append
-          '(("\\\\index{[^{}]*}{\\([^{}\n\r]*\\)" 1 LaTeX-index-entry-list)
-            ("|see{\\([^}]*\\)" 1 LaTeX-index-entry-list))
-          TeX-complete-list))
-
-    ;; RefTeX support
-    (and (fboundp 'reftex-add-index-macros)
-        (reftex-add-index-macros '(multind))))
-  TeX-dialect)
+(require 'tex)
+
+(TeX-add-style-hook
+ "multind"
+ (lambda ()
+
+   ;; Commands
+   (TeX-add-symbols
+    '("makeindex" "Indextag")
+    '("index" TeX-arg-index-tag TeX-arg-index)
+    '("printindex" TeX-arg-index-tag "Title")
+    "printindex" "indexspace")
+
+   ;; Parsing index macros
+   (setq LaTeX-auto-regexp-list
+        (append
+         ;; The first regexp is faster, but less accurate
+         ;; '(("\\\\index\\*?{[^{}]*}{\\([^}]*\\)" 1 LaTeX-auto-index-entry))
+         ;; The second regexp is very good, but slower
+         
'(("\\\\index\\*?{[^{}]*}{\\([^}{]*\\({[^}{]*\\({[^}{]*\\({[^}{]*}[^}{]*\\)*}[^}{]*\\)*}[^}{]*\\)*\\)}"
+            1 LaTeX-auto-index-entry))
+         LaTeX-auto-regexp-list))
+
+   ;; Completion for index entries in the |see and \index commands
+   (setq TeX-complete-list 
+        (append
+         '(("\\\\index{[^{}]*}{\\([^{}\n\r]*\\)" 1 LaTeX-index-entry-list)
+           ("|see{\\([^}]*\\)" 1 LaTeX-index-entry-list))
+         TeX-complete-list))
+
+   ;; RefTeX support
+   (and (fboundp 'reftex-add-index-macros)
+       (reftex-add-index-macros '(multind))))
+ TeX-dialect)
 
 (defvar LaTeX-multind-package-options nil
   "Package options for the multind package.")
diff --git a/style/multirow.el b/style/multirow.el
index 2754f03..6b7155f 100644
--- a/style/multirow.el
+++ b/style/multirow.el
@@ -29,6 +29,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/multitoc.el b/style/multitoc.el
index 94545ee..fb06c83 100644
--- a/style/multitoc.el
+++ b/style/multitoc.el
@@ -31,6 +31,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 (TeX-add-style-hook
  "multitoc"
  (lambda ()