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

[Tassilo Horn]

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

    ; Fix byte-compile warnings in styles
---
 style/ragged2e.el      |   3 +
 style/relsize.el       |   2 +
 style/report.el        |   3 +
 style/revtex4-2.el     |   3 +
 style/ruby.el          |   2 +
 style/scrartcl.el      |   3 +
 style/scrbase.el       |   3 +
 style/scrbook.el       |   5 +-
 style/scrlttr2.el      | 208 +++++++++++++++++++++++++------------------------
 style/scrpage2.el      |   2 +
 style/scrreprt.el      |   3 +
 style/setspace.el      |   3 +
 style/shortvrb.el      |   3 +
 style/siunitx.el       |   1 +
 style/slides.el        |   3 +
 style/slovak.el        |   2 +
 style/sourcecodepro.el |   3 +
 style/splitidx.el      |   1 +
 style/subcaption.el    |   3 +
 style/subfigure.el     |   3 +
 style/subfiles.el      |   3 +
 style/swedish.el       |   3 +
 22 files changed, 162 insertions(+), 103 deletions(-)

diff --git a/style/ragged2e.el b/style/ragged2e.el
index c30d3a4..56750fb 100644
--- a/style/ragged2e.el
+++ b/style/ragged2e.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/relsize.el b/style/relsize.el
index 6c57580..d9724ac 100644
--- a/style/relsize.el
+++ b/style/relsize.el
@@ -31,6 +31,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/report.el b/style/report.el
index f3adb17..125f199 100644
--- a/style/report.el
+++ b/style/report.el
@@ -2,6 +2,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 (defvar LaTeX-report-class-options
   '("a4paper" "a5paper" "b5paper" "letterpaper" "legalpaper" "executivepaper"
     "landscape" "10pt" "11pt" "12pt" "oneside" "twoside" "draft" "final"
diff --git a/style/revtex4-2.el b/style/revtex4-2.el
index d8fd353..63daeb0 100644
--- a/style/revtex4-2.el
+++ b/style/revtex4-2.el
@@ -31,6 +31,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/ruby.el b/style/ruby.el
index 3e36f7e..9c18fa3 100644
--- a/style/ruby.el
+++ b/style/ruby.el
@@ -30,6 +30,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 (defvar LaTeX-ruby-package-options
   '("overlap" "nooverlap" "CJK" "latin")
   "Package options for the ruby package.")
diff --git a/style/scrartcl.el b/style/scrartcl.el
index 541ffbf..49509fb 100644
--- a/style/scrartcl.el
+++ b/style/scrartcl.el
@@ -14,6 +14,9 @@
 
 ;; This file is part of  AUCTeX.
 
+(require 'tex)
+(require 'latex)
+
 ;;; Code:
 (TeX-add-style-hook
  "scrartcl"
diff --git a/style/scrbase.el b/style/scrbase.el
index 54668ef..e288e34 100644
--- a/style/scrbase.el
+++ b/style/scrbase.el
@@ -32,6 +32,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/scrbook.el b/style/scrbook.el
index 9398899..3b4586f 100644
--- a/style/scrbook.el
+++ b/style/scrbook.el
@@ -23,13 +23,16 @@
 ;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 ;; 02110-1301, USA.
 
-;;; Commentary: 
+;;; Commentary:
 
 ;; This file adds support for `scrbook.cls'. This file needs
 ;; `scrbase.el'.
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/scrlttr2.el b/style/scrlttr2.el
index 89f22e2..4e168c9 100644
--- a/style/scrlttr2.el
+++ b/style/scrlttr2.el
@@ -23,7 +23,7 @@
 ;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 ;; 02110-1301, USA.
 
-;;; Commentary: 
+;;; Commentary:
 
 ;; This file adds support for `scrlttr2.cls'.
 
@@ -37,111 +37,115 @@
 
 ;;; Code
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
                  (keywords class))
 
-(TeX-add-style-hook "scrlttr2"
-  (lambda ()
-    (TeX-add-symbols
-     '("AtBeginLetter" t)
-     '("KOMAoptions" t)
-     '("LetterOptionNeedsPapersize" "Name of lco file" "Paper size")
-     '("LoadLetterOption" "Name of lco file")
-     '("addrchar" "Initial letter")
-     '("addrentry" "Lastname" "Firstname" "Address" "Telephone" "F1"
-       "F2" "F3" "F4" "Key")
-     '("addtokomafont" TeX-arg-KOMA-scrlttr-fontelements t)
-     '("addtolengthplength" [ "Factor" ] "Name of length"
-       "Name of pseudo length")
-     '("addtoreffields" TeX-arg-KOMA-scrlttr-vars)
-     '("adrchar" "Initial letter")
-     '("adrentry" "Lastname" "Firstname" "Address" "Telephone" "F1"
-       "F2" "Comment" "Key")
-     '("bankname" t)
-     '("captionsUKenglish" nil)
-     '("captionsUSenglish" nil)
-     '("captionsamerican" nil)
-     '("captionsaustrian" nil)
-     '("captionsbritish" nil)
-     '("captionscroatian" nil)
-     '("captionsdutch" nil)
-     '("captionsenglish" nil)
-     '("captionsfrench" nil)
-     '("captionsgerman" nil)
-     '("captionsitalian" nil)
-     '("captionsngerman" nil)
-     '("captionsspanish" nil)
-     '("cc" t)
-     '("ccname" t)
-     '("cleardoubleemptypage")
-     '("cleardoubleplainpage")
-     '("cleardoublestandardpage")
-     '("closing" "Closing Phrase")
-     '("customername" t)
-     '("dateUKenglish" nil)
-     '("dateUSenglish" nil)
-     '("dateamerican" nil)
-     '("dateaustrian" nil)
-     '("datebritish" nil)
-     '("datecroatian" nil)
-     '("datedutch" nil)
-     '("dateenglish" nil)
-     '("datefrench" nil)
-     '("dategerman" nil)
-     '("dateitalian" nil)
-     '("datename" t)
-     '("datengerman" nil)
-     '("datespanish" nil)
-     '("emailname" t)
-     '("encl" t)
-     '("enclname" t)
-     '("faxname" t)
-     '("firstfoot" t)
-     '("firsthead" t)
-     '("headfromname" t)
-     '("headtoname" t)
-     '("ifkomavarempty" TeX-arg-KOMA-scrlttr-vars 2)
-     '("ifkomavarempty*" TeX-arg-KOMA-scrlttr-vars 2)
-     '("invoicename" t)
-     '("myrefname" t)
-     '("newcaptionname" "Language" "Term" "Definition")
-     '("newkomavar" [ "Description" ] "Name")
-     '("newkomavar*" [ "Description" ] "Name")
-     '("nextfoot" t)
-     '("nexthead" t)
-     '("opening" "Opening")
-     '("pagename" t)
-     '("phonename" t)
-     '("providecaptionname" "Language" "Term" "Definition")
-     '("ps")
-     '("raggedsignature" nil)
-     '("renewcaptionname" "Language" "Term" "Definition")
-     '("setkomafont" TeX-arg-KOMA-scrlttr-fontelements t)
-     '("setkomavar" TeX-arg-KOMA-scrlttr-vars [ "Description" ] t)
-     '("setkomavar*" TeX-arg-KOMA-scrlttr-vars "Description")
-     '("setlengthtoplength" [ "Factor" ] "Name of length"
-       "Name of pseudo length")
-     '("subjectname" t)
-     '("usekomafont" TeX-arg-KOMA-scrlttr-fontelements)
-     '("usekomavar" [ "Command" ] TeX-arg-KOMA-scrlttr-vars)
-     '("usekomavar*" [ "Command" ] TeX-arg-KOMA-scrlttr-vars)
-     '("useplength" "Name")
-     '("wwwname" t)
-     '("yourmailname" t)
-     '("yourrefname" t))
-    (LaTeX-add-environments
-     '("letter" (lambda (env &rest ignore)
-                 (LaTeX-insert-environment
-                  env
-                  (let ((options (TeX-read-string "Optional options: "))
-                        (recip (TeX-read-string "Recipient: ")))
-                    (concat
-                     (if (not (zerop (length options)))
-                         (format "[%s]" options))
-                     (format "{%s}" recip)))))))
-    ;; Definitions for font-latex
+(TeX-add-style-hook
+ "scrlttr2"
+ (lambda ()
+   (TeX-add-symbols
+    '("AtBeginLetter" t)
+    '("KOMAoptions" t)
+    '("LetterOptionNeedsPapersize" "Name of lco file" "Paper size")
+    '("LoadLetterOption" "Name of lco file")
+    '("addrchar" "Initial letter")
+    '("addrentry" "Lastname" "Firstname" "Address" "Telephone" "F1"
+      "F2" "F3" "F4" "Key")
+    '("addtokomafont" TeX-arg-KOMA-scrlttr-fontelements t)
+    '("addtolengthplength" [ "Factor" ] "Name of length"
+      "Name of pseudo length")
+    '("addtoreffields" TeX-arg-KOMA-scrlttr-vars)
+    '("adrchar" "Initial letter")
+    '("adrentry" "Lastname" "Firstname" "Address" "Telephone" "F1"
+      "F2" "Comment" "Key")
+    '("bankname" t)
+    '("captionsUKenglish" nil)
+    '("captionsUSenglish" nil)
+    '("captionsamerican" nil)
+    '("captionsaustrian" nil)
+    '("captionsbritish" nil)
+    '("captionscroatian" nil)
+    '("captionsdutch" nil)
+    '("captionsenglish" nil)
+    '("captionsfrench" nil)
+    '("captionsgerman" nil)
+    '("captionsitalian" nil)
+    '("captionsngerman" nil)
+    '("captionsspanish" nil)
+    '("cc" t)
+    '("ccname" t)
+    '("cleardoubleemptypage")
+    '("cleardoubleplainpage")
+    '("cleardoublestandardpage")
+    '("closing" "Closing Phrase")
+    '("customername" t)
+    '("dateUKenglish" nil)
+    '("dateUSenglish" nil)
+    '("dateamerican" nil)
+    '("dateaustrian" nil)
+    '("datebritish" nil)
+    '("datecroatian" nil)
+    '("datedutch" nil)
+    '("dateenglish" nil)
+    '("datefrench" nil)
+    '("dategerman" nil)
+    '("dateitalian" nil)
+    '("datename" t)
+    '("datengerman" nil)
+    '("datespanish" nil)
+    '("emailname" t)
+    '("encl" t)
+    '("enclname" t)
+    '("faxname" t)
+    '("firstfoot" t)
+    '("firsthead" t)
+    '("headfromname" t)
+    '("headtoname" t)
+    '("ifkomavarempty" TeX-arg-KOMA-scrlttr-vars 2)
+    '("ifkomavarempty*" TeX-arg-KOMA-scrlttr-vars 2)
+    '("invoicename" t)
+    '("myrefname" t)
+    '("newcaptionname" "Language" "Term" "Definition")
+    '("newkomavar" [ "Description" ] "Name")
+    '("newkomavar*" [ "Description" ] "Name")
+    '("nextfoot" t)
+    '("nexthead" t)
+    '("opening" "Opening")
+    '("pagename" t)
+    '("phonename" t)
+    '("providecaptionname" "Language" "Term" "Definition")
+    '("ps")
+    '("raggedsignature" nil)
+    '("renewcaptionname" "Language" "Term" "Definition")
+    '("setkomafont" TeX-arg-KOMA-scrlttr-fontelements t)
+    '("setkomavar" TeX-arg-KOMA-scrlttr-vars [ "Description" ] t)
+    '("setkomavar*" TeX-arg-KOMA-scrlttr-vars "Description")
+    '("setlengthtoplength" [ "Factor" ] "Name of length"
+      "Name of pseudo length")
+    '("subjectname" t)
+    '("usekomafont" TeX-arg-KOMA-scrlttr-fontelements)
+    '("usekomavar" [ "Command" ] TeX-arg-KOMA-scrlttr-vars)
+    '("usekomavar*" [ "Command" ] TeX-arg-KOMA-scrlttr-vars)
+    '("useplength" "Name")
+    '("wwwname" t)
+    '("yourmailname" t)
+    '("yourrefname" t))
+   (LaTeX-add-environments
+    '("letter" (lambda (env &rest ignore)
+                (LaTeX-insert-environment
+                 env
+                 (let ((options (TeX-read-string "Optional options: "))
+                       (recip (TeX-read-string "Recipient: ")))
+                   (concat
+                    (if (not (zerop (length options)))
+                        (format "[%s]" options))
+                    (format "{%s}" recip)))))))
+   ;; Definitions for font-latex
    (when (and (featurep 'font-latex)
              (eq TeX-install-font-lock 'font-latex-setup))
      ;; Textual keywords
@@ -203,7 +207,7 @@
                                "cleardoubleplainpage"
                                "cleardoubleemptypage")
                              'warning)))
-  TeX-dialect)
+ TeX-dialect)
 
 (defun TeX-arg-KOMA-scrlttr-vars (optional &optional prompt)
   "Prompt for KOMA-Script's scrlttr2 predefined variables with completion."
diff --git a/style/scrpage2.el b/style/scrpage2.el
index 49f511b..8ad4249 100644
--- a/style/scrpage2.el
+++ b/style/scrpage2.el
@@ -27,6 +27,8 @@
 
 ;;; Code:
 
+(require 'tex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/scrreprt.el b/style/scrreprt.el
index 406109b..3b7120f 100644
--- a/style/scrreprt.el
+++ b/style/scrreprt.el
@@ -30,6 +30,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/setspace.el b/style/setspace.el
index 4d7df5a..39cf153 100644
--- a/style/setspace.el
+++ b/style/setspace.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/shortvrb.el b/style/shortvrb.el
index a20a067..822c84b 100644
--- a/style/shortvrb.el
+++ b/style/shortvrb.el
@@ -41,6 +41,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'tex-style)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-to-syntax-alist
                  "font-latex"
diff --git a/style/siunitx.el b/style/siunitx.el
index 9e3631d..bcda14a 100644
--- a/style/siunitx.el
+++ b/style/siunitx.el
@@ -30,6 +30,7 @@
 ;;; Code:
 
 (require 'tex) ;Indispensable when compiling the call to `TeX-auto-add-type'.
+(require 'latex)
 
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
diff --git a/style/slides.el b/style/slides.el
index 50970ca..fabdb23 100644
--- a/style/slides.el
+++ b/style/slides.el
@@ -31,6 +31,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 (defvar LaTeX-slides-class-options
   '("a4paper" "a5paper" "b5paper" "letterpaper" "legalpaper" "executivepaper"
     "landscape" "clock" "draft" "final" "titlepage" "notitlepage" "onecolumn"
diff --git a/style/slovak.el b/style/slovak.el
index 393ebf8..705ef5d 100644
--- a/style/slovak.el
+++ b/style/slovak.el
@@ -1,5 +1,7 @@
 ;;; slovak.el --- Setup AUCTeX for editing Slovak text.  -*- lexical-binding: 
t; -*-
 
+(require 'tex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-quotes
                  "font-latex"
diff --git a/style/sourcecodepro.el b/style/sourcecodepro.el
index 6ce3da0..ff308e8 100644
--- a/style/sourcecodepro.el
+++ b/style/sourcecodepro.el
@@ -31,6 +31,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/splitidx.el b/style/splitidx.el
index 70572ae..ccd9863 100644
--- a/style/splitidx.el
+++ b/style/splitidx.el
@@ -90,6 +90,7 @@
 
 ;; Needed for auto-parsing:
 (require 'tex)
+(require 'latex)
 
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
diff --git a/style/subcaption.el b/style/subcaption.el
index 4a573d4..0780523 100644
--- a/style/subcaption.el
+++ b/style/subcaption.el
@@ -31,6 +31,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/subfigure.el b/style/subfigure.el
index b3e91e1..d967ed1 100644
--- a/style/subfigure.el
+++ b/style/subfigure.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/subfiles.el b/style/subfiles.el
index ee3aeb5..f23cc9f 100644
--- a/style/subfiles.el
+++ b/style/subfiles.el
@@ -33,6 +33,9 @@
 
 ;;; Code:
 
+(require 'tex)
+(require 'latex)
+
 ;; Silence the compiler:
 (declare-function font-latex-add-keywords
                  "font-latex"
diff --git a/style/swedish.el b/style/swedish.el
index 1f1e994..0cef29e 100644
--- a/style/swedish.el
+++ b/style/swedish.el
@@ -4,6 +4,9 @@
 ;;
 ;; Apparently the Swedes use ''this style'' quotations.
 
+(require 'tex)
+(require 'latex)
+
 (TeX-add-style-hook
  "swedish"
  (lambda ()