branch: externals/auctex commit 3c129fbcdbe3725cc1e24ae30b0d097bf231cf2c Author: Tassilo Horn <t...@gnu.org> Commit: Tassilo Horn <t...@gnu.org>
; Fix byte-compile warnings in styles --- style/ocg-p.el | 1 + style/ocgx.el | 2 ++ style/overpic.el | 3 +++ style/paracol.el | 3 +++ style/paralist.el | 3 +++ style/pdflscape.el | 2 ++ style/pdfpages.el | 2 ++ style/pdfsync.el | 2 ++ style/placeins.el | 2 ++ style/plext.el | 3 +++ style/plfonts.el | 10 ++++++--- style/plhb.el | 9 ++++++--- style/polish.el | 3 +++ style/polski.el | 2 ++ style/polyglossia.el | 1 + style/preview.el | 3 +++ style/prosper.el | 3 ++- style/psfig.el | 57 ++++++++++++++++++++++++++-------------------------- style/pst-grad.el | 2 ++ 19 files changed, 77 insertions(+), 36 deletions(-) diff --git a/style/ocg-p.el b/style/ocg-p.el index e6c8c47..3f48d84 100644 --- a/style/ocg-p.el +++ b/style/ocg-p.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/ocgx.el b/style/ocgx.el index 83142a2..ee2af56 100644 --- a/style/ocgx.el +++ b/style/ocgx.el @@ -31,6 +31,8 @@ ;;; Code: +(require 'tex) + ;; Silence the compiler: (declare-function font-latex-add-keywords "font-latex" diff --git a/style/overpic.el b/style/overpic.el index 6965add..2d48c9b 100644 --- a/style/overpic.el +++ b/style/overpic.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/paracol.el b/style/paracol.el index 48a692f..943f09a 100644 --- a/style/paracol.el +++ b/style/paracol.el @@ -46,6 +46,9 @@ ;;; Code: +(require 'tex) +(require 'latex) + ;; Silence the compiler: (declare-function font-latex-add-keywords "font-latex" diff --git a/style/paralist.el b/style/paralist.el index b4afe46..7ca772c 100644 --- a/style/paralist.el +++ b/style/paralist.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/pdflscape.el b/style/pdflscape.el index 5c0bc70..8511663 100644 --- a/style/pdflscape.el +++ b/style/pdflscape.el @@ -31,6 +31,8 @@ ;;; Code: +(require 'tex) + (TeX-add-style-hook "pdflscape" (lambda () diff --git a/style/pdfpages.el b/style/pdfpages.el index 4b99675..ee267d1 100644 --- a/style/pdfpages.el +++ b/style/pdfpages.el @@ -34,6 +34,8 @@ ;;; Code: +(require 'tex) + ;; Silence the compiler: (declare-function font-latex-add-keywords "font-latex" diff --git a/style/pdfsync.el b/style/pdfsync.el index aec602b..d4f7629 100644 --- a/style/pdfsync.el +++ b/style/pdfsync.el @@ -30,6 +30,8 @@ ;;; Code: +(require 'tex) + (defun LaTeX-pdfsync-output-page () "Return page number in output file corresponding to buffer position." (let* ((line (line-number-at-pos)) diff --git a/style/placeins.el b/style/placeins.el index b67848b..1eee1b8 100644 --- a/style/placeins.el +++ b/style/placeins.el @@ -29,6 +29,8 @@ ;;; Code: +(require 'tex) + (TeX-add-style-hook "placeins" (lambda () diff --git a/style/plext.el b/style/plext.el index c32e648..c686792 100644 --- a/style/plext.el +++ b/style/plext.el @@ -30,6 +30,9 @@ ;;; Code: +(require 'tex) +(require 'latex) + (TeX-add-style-hook "plext" (lambda () diff --git a/style/plfonts.el b/style/plfonts.el index f7de652..51c0a81 100644 --- a/style/plfonts.el +++ b/style/plfonts.el @@ -7,14 +7,18 @@ ;;; Code: +(require 'tex) +(require 'latex) + (defvar LaTeX-plfonts-mode-syntax-table (copy-syntax-table LaTeX-mode-syntax-table) "Syntax table used in LaTeX mode when using `plfonts.sty'.") (modify-syntax-entry ?\" "w" LaTeX-plfonts-mode-syntax-table) -(TeX-add-style-hook "plfonts" - (function (lambda () +(TeX-add-style-hook + "plfonts" + (lambda () (set-syntax-table LaTeX-plfonts-mode-syntax-table) (make-local-variable 'TeX-open-quote) (make-local-variable 'TeX-close-quote) @@ -24,7 +28,7 @@ (setq TeX-close-quote "\">") (setq TeX-quote-after-quote t) (setq TeX-command-default "plLaTeX") - (run-hooks 'TeX-language-pl-hook))) + (run-hooks 'TeX-language-pl-hook)) TeX-dialect) ;;; plfonts.el ends here diff --git a/style/plhb.el b/style/plhb.el index 82a00a3..3247e2a 100644 --- a/style/plhb.el +++ b/style/plhb.el @@ -7,14 +7,17 @@ ;;; Code: +(require 'tex) + (defvar LaTeX-plhb-mode-syntax-table (copy-syntax-table LaTeX-mode-syntax-table) "Syntax table used in LaTeX mode when using `plhb.sty'.") (modify-syntax-entry ?\" "w" LaTeX-plhb-mode-syntax-table) -(TeX-add-style-hook "plhb" - (function (lambda () +(TeX-add-style-hook + "plhb" + (lambda () (set-syntax-table LaTeX-plhb-mode-syntax-table) (make-local-variable 'TeX-open-quote) (make-local-variable 'TeX-close-quote) @@ -24,7 +27,7 @@ (setq TeX-close-quote "\">") (setq TeX-quote-after-quote t) (setq TeX-command-default "plLaTeX") - (run-hooks 'TeX-language-pl-hook))) + (run-hooks 'TeX-language-pl-hook)) TeX-dialect) ;;; plhb.el ends here diff --git a/style/polish.el b/style/polish.el index 0c27bf3..ab7936c 100644 --- a/style/polish.el +++ b/style/polish.el @@ -31,6 +31,9 @@ ;;; Code: +(require 'tex) +(require 'latex) + (defvar LaTeX-polish-mode-syntax-table (copy-syntax-table LaTeX-mode-syntax-table) "Syntax table used in LaTeX mode when using `polish.sty'.") diff --git a/style/polski.el b/style/polski.el index 433096b..83c4840 100644 --- a/style/polski.el +++ b/style/polski.el @@ -31,6 +31,8 @@ ;;; Code: +(require 'tex) + ;; Silence the compiler: (declare-function font-latex-add-quotes "font-latex" diff --git a/style/polyglossia.el b/style/polyglossia.el index 20b9fc0..97fee5d 100644 --- a/style/polyglossia.el +++ b/style/polyglossia.el @@ -36,6 +36,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/preview.el b/style/preview.el index ec6d9fb..f36ca6c 100644 --- a/style/preview.el +++ b/style/preview.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/prosper.el b/style/prosper.el index 3960abc..85e9e2e 100644 --- a/style/prosper.el +++ b/style/prosper.el @@ -59,7 +59,8 @@ ;; auctex. I shall have to download the latest version, and see if ;; its already been fixed. - +(require 'tex) +(require 'latex) (defconst LaTeX-prosper-version "2008-05-25" "prosper.el version.") diff --git a/style/psfig.el b/style/psfig.el index 7aabe6f..d8cf78b 100644 --- a/style/psfig.el +++ b/style/psfig.el @@ -7,39 +7,38 @@ ;;; Code: -(TeX-add-style-hook "psfig" - (function - (lambda () - ;; probable some of the following symbols may be removed - (TeX-add-symbols "protect" "figurepath" "fbox" - "other" "letter" "other" "then" "Sine" "Cosine" - "psdraft" "psfull" "psscalefirst" "psrotatefirst" - "psnodraftbox" "psdraftbox" "pssilent" "psnoisy" - "minmaxtest" - '("psfig" TeX-arg-psfig) - '("psfigurepath" t) - ) - (LaTeX-add-environments - '("psfigure" LaTeX-env-psfigure) - ) - )) +(require 'tex) +(require 'latex) + +(TeX-add-style-hook + "psfig" + (lambda () + ;; probable some of the following symbols may be removed + (TeX-add-symbols "protect" "figurepath" "fbox" + "other" "letter" "other" "then" "Sine" "Cosine" + "psdraft" "psfull" "psscalefirst" "psrotatefirst" + "psnodraftbox" "psdraftbox" "pssilent" "psnoisy" + "minmaxtest" + '("psfig" TeX-arg-psfig) + '("psfigurepath" t) + ) + (LaTeX-add-environments + '("psfigure" LaTeX-env-psfigure))) TeX-dialect) (defun TeX-arg-psfig (_optional) - "Ask for file, width and length. Insert psfig macro" - (let ((psfile (read-file-name "PS-file: " "" "" nil)) - (figwidth (TeX-read-string "Figure width: ")) - (figheight (TeX-read-string "Figure height: ")) - ) + "Ask for file, width and length. Insert psfig macro" + (let ((psfile (read-file-name "PS-file: " "" "" nil)) + (figwidth (TeX-read-string "Figure width: ")) + (figheight (TeX-read-string "Figure height: ")) + ) - (insert TeX-grop "figure=" psfile) - (if (not (zerop (length figwidth))) - (insert ",width=" figwidth)) - (if (not (zerop (length figheight))) - (insert ",height=" figheight)) - (insert TeX-grcl) - ) - ) + (insert TeX-grop "figure=" psfile) + (if (not (zerop (length figwidth))) + (insert ",width=" figwidth)) + (if (not (zerop (length figheight))) + (insert ",height=" figheight)) + (insert TeX-grcl))) (defun LaTeX-env-psfigure (_environment) diff --git a/style/pst-grad.el b/style/pst-grad.el index 50417a5..0426a73 100644 --- a/style/pst-grad.el +++ b/style/pst-grad.el @@ -33,6 +33,8 @@ ;;; Code: +(require 'tex) + ;; Silence the compiler: (defvar LaTeX-pst-fillstyle-list) (defvar LaTeX-pst-parameters-completion-regexp)