branch: externals/auctex commit 471748b4fbe14da6d33b29b9a4faec8d86d246c5 Author: Tassilo Horn <t...@gnu.org> Commit: Tassilo Horn <t...@gnu.org>
; Fix byte-compiler warnings in styles --- style/kantlipsum.el | 2 ++ style/kpfonts.el | 3 ++ style/latexinfo.el | 3 ++ style/letter.el | 3 ++ style/lettrine.el | 3 ++ style/lipsum.el | 2 ++ style/longtable.el | 3 ++ style/lscape.el | 3 ++ style/ltablex.el | 2 ++ style/ltugboat.el | 4 +++ style/ltx-base.el | 95 +++++++++++++++++++++++++++-------------------------- style/ltxdoc.el | 2 ++ style/ltxguide.el | 3 ++ style/ltxtable.el | 3 ++ style/luacode.el | 3 ++ style/luatextra.el | 16 +++++---- 16 files changed, 96 insertions(+), 54 deletions(-) diff --git a/style/kantlipsum.el b/style/kantlipsum.el index 05c4986..ce33062 100644 --- a/style/kantlipsum.el +++ b/style/kantlipsum.el @@ -29,6 +29,8 @@ ;;; Code: +(require 'tex) + (TeX-add-style-hook "kantlipsum" (lambda () diff --git a/style/kpfonts.el b/style/kpfonts.el index bb0c9e7..22e0d60 100644 --- a/style/kpfonts.el +++ b/style/kpfonts.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/latexinfo.el b/style/latexinfo.el index 2e0d9f0..b79ef38 100644 --- a/style/latexinfo.el +++ b/style/latexinfo.el @@ -21,6 +21,9 @@ ;;; Code: +(require 'tex) +(require 'latex) + ;;; LaTeXinfo mode (defvar TeX-latexinfo-node-regexp diff --git a/style/letter.el b/style/letter.el index bcc1b2b..a76a9d1 100644 --- a/style/letter.el +++ b/style/letter.el @@ -25,6 +25,9 @@ ;;; Code: +(require 'tex) +(require 'latex) + ;; Silence the compiler: (declare-function font-latex-add-keywords "font-latex" diff --git a/style/lettrine.el b/style/lettrine.el index 5be5fd2..a342793 100644 --- a/style/lettrine.el +++ b/style/lettrine.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/lipsum.el b/style/lipsum.el index be80b0f..7378bc7 100644 --- a/style/lipsum.el +++ b/style/lipsum.el @@ -29,6 +29,8 @@ ;;; Code: +(require 'tex) + (TeX-add-style-hook "lipsum" (lambda () diff --git a/style/longtable.el b/style/longtable.el index 18efcdd..27b6195 100644 --- a/style/longtable.el +++ b/style/longtable.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/lscape.el b/style/lscape.el index 980fc6e..e60cc17 100644 --- a/style/lscape.el +++ b/style/lscape.el @@ -30,6 +30,9 @@ ;;; Code: +(require 'tex) +(require 'latex) + (TeX-add-style-hook "lscape" (lambda () diff --git a/style/ltablex.el b/style/ltablex.el index 94c2b9c..1a6c014 100644 --- a/style/ltablex.el +++ b/style/ltablex.el @@ -34,6 +34,8 @@ ;;; Code: +(require 'tex) + (TeX-add-style-hook "ltablex" (lambda () diff --git a/style/ltugboat.el b/style/ltugboat.el index f09e6a8..3499d6d 100644 --- a/style/ltugboat.el +++ b/style/ltugboat.el @@ -31,6 +31,10 @@ ;;; Code: +(require 'crm) +(require 'tex) +(require 'latex) + ;; Silence the compiler: (declare-function font-latex-add-keywords "font-latex" diff --git a/style/ltx-base.el b/style/ltx-base.el index bd49718..20b79b6 100644 --- a/style/ltx-base.el +++ b/style/ltx-base.el @@ -31,55 +31,56 @@ ;;; Code: +(require 'tex) + (TeX-add-style-hook "ltx-base" - (function - (lambda () - (TeX-add-symbols - '("DeclareRobustCommand" TeX-arg-define-macro [ "Number of arguments" ] t) - '("CheckCommand" TeX-arg-define-macro [ "Number of arguments" ] t) - '("@addtoreset" TeX-arg-counter "Within counter" "counter") - '("addvspace" "space") - '("addpenalty" "penalty") - '("ProvidesClass" "name" [ "release information" ]) - '("ProvidesPackage" "name" [ "release information" ]) - '("ProvidesFile" "filename" [ "release information" ]) - '("NeedsTeXFormat" "format" [ "release" ]) - '("DeclareOption" "option" t) - ;; would be great if DeclareOption RET * RET would give - ;; \DeclareOption*! - '("DeclareOption*" t) - '("CurrentOption" 0) - '("PassOptionsToPackage" "option list" "package") - '("ExecuteOptions" "option list") - '("ProcessOptions" (TeX-arg-literal "\\relax")) - "ProcessOptions*" - '("OptionNotUsed" 0) - ;; candidate for opt/mand toggling - '("RequirePackage" [ "option list" ] "package" [ "release" ]) - '("LoadClass" [ "option list" ] "class" [ "release" ]) - '("AtEndOfPackage" t) - '("AtEndOfClass" t) - '("AtBeginDocument" t) - '("AtEndDocument" t) - '("IfFileExists" "filename" 2) - '("InputIfFileExists" "filename" 2) - '("PackageWarning" "name" t) - '("PackageWarningNoLine" "name" t) - '("PackageInfo" "name" t) - '("PackageError" "name" "short text" t) - '("ClassWarning" "name" t) - '("ClassWarningNoLine" "name" t) - '("ClassInfo" "name" t) - '("ClassError" "name" "short text" t) - '("MessageBreak" 0) - '("@ifpackageloaded" "package" 2) - '("@ifpackagelater" "package" "date" 2) - '("@ifpackagewith" "package" "options" 2) - '("message" "Log Message") - '("@ifundefined" "Macro Name" 2) - '("@ifnextchar" (TeX-arg-literal " ") (TeX-arg-free "character") 2 ) - "expandafter"))) + (lambda () + (TeX-add-symbols + '("DeclareRobustCommand" TeX-arg-define-macro [ "Number of arguments" ] t) + '("CheckCommand" TeX-arg-define-macro [ "Number of arguments" ] t) + '("@addtoreset" TeX-arg-counter "Within counter" "counter") + '("addvspace" "space") + '("addpenalty" "penalty") + '("ProvidesClass" "name" [ "release information" ]) + '("ProvidesPackage" "name" [ "release information" ]) + '("ProvidesFile" "filename" [ "release information" ]) + '("NeedsTeXFormat" "format" [ "release" ]) + '("DeclareOption" "option" t) + ;; would be great if DeclareOption RET * RET would give + ;; \DeclareOption*! + '("DeclareOption*" t) + '("CurrentOption" 0) + '("PassOptionsToPackage" "option list" "package") + '("ExecuteOptions" "option list") + '("ProcessOptions" (TeX-arg-literal "\\relax")) + "ProcessOptions*" + '("OptionNotUsed" 0) + ;; candidate for opt/mand toggling + '("RequirePackage" [ "option list" ] "package" [ "release" ]) + '("LoadClass" [ "option list" ] "class" [ "release" ]) + '("AtEndOfPackage" t) + '("AtEndOfClass" t) + '("AtBeginDocument" t) + '("AtEndDocument" t) + '("IfFileExists" "filename" 2) + '("InputIfFileExists" "filename" 2) + '("PackageWarning" "name" t) + '("PackageWarningNoLine" "name" t) + '("PackageInfo" "name" t) + '("PackageError" "name" "short text" t) + '("ClassWarning" "name" t) + '("ClassWarningNoLine" "name" t) + '("ClassInfo" "name" t) + '("ClassError" "name" "short text" t) + '("MessageBreak" 0) + '("@ifpackageloaded" "package" 2) + '("@ifpackagelater" "package" "date" 2) + '("@ifpackagewith" "package" "options" 2) + '("message" "Log Message") + '("@ifundefined" "Macro Name" 2) + '("@ifnextchar" (TeX-arg-literal " ") (TeX-arg-free "character") 2 ) + "expandafter")) TeX-dialect) ;; Local Variables: diff --git a/style/ltxdoc.el b/style/ltxdoc.el index d29c62d..8c8bbc5 100644 --- a/style/ltxdoc.el +++ b/style/ltxdoc.el @@ -29,6 +29,8 @@ ;;; Code: +(require 'tex) + (TeX-add-style-hook "ltxdoc" (lambda () diff --git a/style/ltxguide.el b/style/ltxguide.el index 678886c..8c4bdbd 100644 --- a/style/ltxguide.el +++ b/style/ltxguide.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/ltxtable.el b/style/ltxtable.el index 0d3f878..5b3d49c 100644 --- a/style/ltxtable.el +++ b/style/ltxtable.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/luacode.el b/style/luacode.el index a9a6232..d544424 100644 --- a/style/luacode.el +++ b/style/luacode.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/luatextra.el b/style/luatextra.el index b9ddf89..5ce6f11 100644 --- a/style/luatextra.el +++ b/style/luatextra.el @@ -29,14 +29,16 @@ ;;; Code: +(require 'tex) + (TeX-add-style-hook - "luatextra" - (lambda () - (TeX-run-style-hooks "ifluatex" "fontspec" - ;; FIXME: yet to be written: - ;; "luatexbase" - "metalogo" "luacode")) - TeX-dialect) + "luatextra" + (lambda () + (TeX-run-style-hooks "ifluatex" "fontspec" + ;; FIXME: yet to be written: + ;; "luatexbase" + "metalogo" "luacode")) + TeX-dialect) (defvar LaTeX-luatextra-package-options nil "Package options for the ifluatex package.")