[AUCTeX-diffs] [elpa] externals/auctex fc037de 44/62: ; Fix byte-compiler warnings in styles

[Tassilo Horn]

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

    ; Fix byte-compiler warnings in styles
---
 style/icelandic.el |   3 ++
 style/ifluatex.el  |   3 ++
 style/imakeidx.el  |   3 ++
 style/index.el     | 109 +++++++++++++++++++++++++++--------------------------
 style/inputenc.el  |   2 +
 style/italian.el   |   2 +
 style/nicefrac.el  |   3 ++
 7 files changed, 72 insertions(+), 53 deletions(-)

diff --git a/style/icelandic.el b/style/icelandic.el
index 58f2e3c..622b00a 100644
--- a/style/icelandic.el
+++ b/style/icelandic.el
@@ -31,6 +31,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-quotes
                  "font-latex"
diff --git a/style/ifluatex.el b/style/ifluatex.el
index 9964ee3..3986fdd 100644
--- a/style/ifluatex.el
+++ b/style/ifluatex.el
@@ -29,6 +29,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'tex-buf)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/imakeidx.el b/style/imakeidx.el
index 1410498..f14cfeb 100644
--- a/style/imakeidx.el
+++ b/style/imakeidx.el
@@ -29,6 +29,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 (defvar LaTeX-imakeidx-makeindex-options
   '(("name")
     ("title")
diff --git a/style/index.el b/style/index.el
index cd99840..d541341 100644
--- a/style/index.el
+++ b/style/index.el
@@ -24,59 +24,62 @@
 
 ;;; Code:
 
-(TeX-add-style-hook "index"
-  (lambda ()
-
-    (TeX-add-symbols
-
-     ;; New indices
-     '("newindex" [ "Counter" ] "Tag"
-       "Extension of raw index" "Extension of processed index" "Index title")
-     '("renewindex" [ "Counter" ] "Tag" 
-       "Extension of raw index" "Extension of processed index" "Index title")
-     "makeindex"
-     '("disableindex" "Tag[,tag...]")
-
-     ;; Printing the index
-     '("printindex" [ "Indextag" ] [ "Prologue" ])
-     "indexspace"
-
-     ;; Index entries
-     '("index" [ TeX-arg-index-tag ] TeX-arg-index)
-     '("index*" [ TeX-arg-index-tag ] TeX-arg-index)
-
-     ;; Showidx-like stuff
-     "proofmodetrue" "proofmodefalse" '("indexproofstyle" "Style")
-
-     ;; Shortcuts (THESE ARE DEPRECATED AND SHOULD NOT BE USED
-     "shortindexingon" "shortindexinoff")
-
-    ;; 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 the index entries in \index and |see commands
-    (setq TeX-complete-list
-         (append
-          '(("\\\\index\\*?\\(\\[[^][{}]*\\]\\)?{\\([^{}\n\r]*\\)" 
-             2 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 '(index))))
-  TeX-dialect)
+(require 'tex)
+(require 'latex)
+
+(TeX-add-style-hook
+ "index"
+ (lambda ()
+
+   (TeX-add-symbols
+    ;; New indices
+    '("newindex" [ "Counter" ] "Tag"
+      "Extension of raw index" "Extension of processed index" "Index title")
+    '("renewindex" [ "Counter" ] "Tag"
+      "Extension of raw index" "Extension of processed index" "Index title")
+    "makeindex"
+    '("disableindex" "Tag[,tag...]")
+
+    ;; Printing the index
+    '("printindex" [ "Indextag" ] [ "Prologue" ])
+    "indexspace"
+
+    ;; Index entries
+    '("index" [ TeX-arg-index-tag ] TeX-arg-index)
+    '("index*" [ TeX-arg-index-tag ] TeX-arg-index)
+
+    ;; Showidx-like stuff
+    "proofmodetrue" "proofmodefalse" '("indexproofstyle" "Style")
+
+    ;; Shortcuts (THESE ARE DEPRECATED AND SHOULD NOT BE USED
+    "shortindexingon" "shortindexinoff")
+
+   ;; 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 the index entries in \index and |see commands
+   (setq TeX-complete-list
+        (append
+         '(("\\\\index\\*?\\(\\[[^][{}]*\\]\\)?{\\([^{}\n\r]*\\)" 
+            2 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 '(index))))
+ TeX-dialect)
 
 (defvar LaTeX-index-package-options nil
   "Package options for the index package.")
diff --git a/style/inputenc.el b/style/inputenc.el
index eac202e..613f2dc 100644
--- a/style/inputenc.el
+++ b/style/inputenc.el
@@ -28,6 +28,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 (defun LaTeX-inputenc-package-options nil
   "Prompt for package options for the inputenc package."
   ;; separate the condition in three to silence the byte compiler
diff --git a/style/italian.el b/style/italian.el
index e6240ec..6a6a996 100644
--- a/style/italian.el
+++ b/style/italian.el
@@ -31,6 +31,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-quotes
                  "font-latex"
diff --git a/style/nicefrac.el b/style/nicefrac.el
index 86827c1..2c69a56 100644
--- a/style/nicefrac.el
+++ b/style/nicefrac.el
@@ -29,6 +29,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"