branch: master
commit 01e0d2c8ef9d7d985533c6ae40e696782443b2f4
Author: Arash Esbati <ar...@gnu.org>
Commit: Arash Esbati <ar...@gnu.org>
Use `setq-local'
* style/amsmath.el ("amsmath"):
* style/appendix.el ("appendix"):
* style/array.el (LaTeX-array-update-column-letters, "array"):
* style/beamer.el (LaTeX-beamer-themes-list)
(LaTeX-beamer-inner-themes-list, LaTeX-beamer-outer-themes-list)
(LaTeX-beamer-color-themes-list, LaTeX-beamer-font-themes-list):
* style/dcolumn.el ("dcolumn"):
* style/epigraph.el ("epigraph"):
* style/exam.el ("exam"):
* style/hyperref.el ("hyperref"):
* style/l3doc.el ("l3doc"):
* style/ltugboat.el ("ltugboat"):
* style/plext.el ("plext"):
* style/siunitx.el ("siunitx"):
* style/tabularx.el ("tabularx"):
* style/tabulary.el ("tabulary"):
* style/tcolorboxlib-raster.el ("tcolorboxlib-raster"):
* style/tex-live.el ("tex-live"): Prefer `setq-local' over `set'
and `make-local-variable' combination.
---
style/amsmath.el | 17 ++++++++---------
style/appendix.el | 7 ++++---
style/array.el | 14 +++++++-------
style/beamer.el | 21 ++++++++++-----------
style/dcolumn.el | 6 +++---
style/epigraph.el | 11 +++++------
style/exam.el | 19 +++++++++----------
style/hyperref.el | 13 ++++++-------
style/l3doc.el | 8 ++++----
style/ltugboat.el | 4 ++--
style/plext.el | 13 +++++++------
style/siunitx.el | 6 +++---
style/tabularx.el | 6 +++---
style/tabulary.el | 6 +++---
style/tcolorboxlib-raster.el | 11 +++++------
style/tex-live.el | 6 +++---
16 files changed, 82 insertions(+), 86 deletions(-)
diff --git a/style/amsmath.el b/style/amsmath.el
index f72f8be8..ff0ebc9c 100644
--- a/style/amsmath.el
+++ b/style/amsmath.el
@@ -1,7 +1,6 @@
;;; amsmath.el --- Style hook for the AMS-LaTeX amsmath package. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2002, 2005-2007, 2012-2014, 2017-2020, 2022
-;; Free Software Foundation, Inc.
+;; Copyright (C) 2002--2024 Free Software Foundation, Inc.
;; FIXME: What about the copyright for <= 2001?
;; Author: Carsten Dominik <domi...@strw.leidenuniv.nl>
@@ -153,13 +152,13 @@
("flalign" . LaTeX-amsmath-label)
("gather" . LaTeX-amsmath-label))))
- (set (make-local-variable 'TeX-braces-association)
- (append '(("\\lvert" . "\\rvert")
- ("\\lVert" . "\\rVert"))
- TeX-braces-association))
- (set (make-local-variable 'TeX-left-right-braces)
- (append '(("\\lvert") ("\\rvert") ("\\lVert") ("\\rVert"))
- TeX-left-right-braces))
+ (setq-local TeX-braces-association
+ (append '(("\\lvert" . "\\rvert")
+ ("\\lVert" . "\\rVert"))
+ TeX-braces-association))
+ (setq-local TeX-left-right-braces
+ (append '(("\\lvert") ("\\rvert") ("\\lVert") ("\\rVert"))
+ TeX-left-right-braces))
;; amsmath includes amstext, amsbsy, & amsopn.
;; So we run their hooks, too.
diff --git a/style/appendix.el b/style/appendix.el
index 406aef5f..9912f3ce 100644
--- a/style/appendix.el
+++ b/style/appendix.el
@@ -1,6 +1,6 @@
;;; appendix.el --- AUCTeX style for `appendix.sty' (v1.2c) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2020--2024 Free Software Foundation, Inc.
;; Author: Arash Esbati <ar...@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -68,8 +68,9 @@
;; Don't indent the content inside \(sub\)?appendices environments:
(unless (string-match "appendices" LaTeX-document-regexp)
- (set (make-local-variable 'LaTeX-document-regexp)
- (concat LaTeX-document-regexp "\\|\\(?:sub\\)?appendices"))))
+ (setq-local LaTeX-document-regexp
+ (concat LaTeX-document-regexp
+ "\\|\\(?:sub\\)?appendices"))))
TeX-dialect)
(defvar LaTeX-appendix-package-options '("toc" "page" "title"
diff --git a/style/array.el b/style/array.el
index 001044ec..3d995aae 100644
--- a/style/array.el
+++ b/style/array.el
@@ -1,6 +1,6 @@
;;; array.el --- AUCTeX style for `array.sty' -*- lexical-binding: t; -*-
-;; Copyright (C) 2013-2022 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2024 Free Software Foundation, Inc.
;; Author: Mads Jensen <m...@inducks.org>
;; Maintainer: auctex-devel@gnu.org
@@ -57,10 +57,10 @@ package.")
(defun LaTeX-array-update-column-letters ()
"Update and uniquify the local value of `LaTeX-array-column-letters'."
- (set (make-local-variable 'LaTeX-array-column-letters)
- (let* ((newtypes (mapconcat #'car (LaTeX-array-newcolumntype-list) ""))
- (alltypes (concat LaTeX-array-column-letters newtypes)))
- (seq-concatenate 'string (seq-uniq alltypes #'=)))))
+ (setq-local LaTeX-array-column-letters
+ (let* ((newtypes (mapconcat #'car
(LaTeX-array-newcolumntype-list) ""))
+ (alltypes (concat LaTeX-array-column-letters newtypes)))
+ (seq-concatenate 'string (seq-uniq alltypes #'=)))))
(add-hook 'TeX-auto-prepare-hook #'LaTeX-array-auto-prepare t)
(add-hook 'TeX-auto-cleanup-hook #'LaTeX-array-auto-cleanup t)
@@ -90,8 +90,8 @@ package.")
(LaTeX-add-lengths "extratabsurround" "extrarowheight")
;; `array.sty' adds some new column specification letters.
- (set (make-local-variable 'LaTeX-array-column-letters)
- (concat LaTeX-array-column-letters "m" "b" "w" "W"))
+ (setq-local LaTeX-array-column-letters
+ (concat LaTeX-array-column-letters "m" "b" "w" "W"))
;; Fontification
(when (and (featurep 'font-latex)
diff --git a/style/beamer.el b/style/beamer.el
index d0d2e627..b241b87c 100644
--- a/style/beamer.el
+++ b/style/beamer.el
@@ -1,6 +1,6 @@
;;; beamer.el --- AUCTeX style for the latex-beamer class -*-
lexical-binding: t; -*-
-;; Copyright (C) 2003-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2024 Free Software Foundation, Inc.
;; Author: Thomas Baumann <thomas.baum...@ch.tum.de>
;; Maintainer: auctex-devel@gnu.org
@@ -500,8 +500,7 @@ also be a string. Then the length of the string is used."
(defun LaTeX-beamer-themes-list ()
"Return a list of beamer themes for completion."
(cond ((eq LaTeX-beamer-themes 'local)
- (set (make-local-variable 'LaTeX-beamer-themes)
- (LaTeX-beamer-search-themes)))
+ (setq-local LaTeX-beamer-themes (LaTeX-beamer-search-themes)))
((functionp LaTeX-beamer-themes)
(funcall LaTeX-beamer-themes))
((listp LaTeX-beamer-themes)
@@ -513,8 +512,8 @@ also be a string. Then the length of the string is used."
(defun LaTeX-beamer-inner-themes-list ()
"Return a list of beamer inner themes for completion."
(cond ((eq LaTeX-beamer-inner-themes 'local)
- (set (make-local-variable 'LaTeX-beamer-inner-themes)
- (LaTeX-beamer-search-themes "^beamerinnertheme")))
+ (setq-local LaTeX-beamer-inner-themes
+ (LaTeX-beamer-search-themes "^beamerinnertheme")))
((functionp LaTeX-beamer-inner-themes)
(funcall LaTeX-beamer-inner-themes))
((listp LaTeX-beamer-inner-themes)
@@ -526,8 +525,8 @@ also be a string. Then the length of the string is used."
(defun LaTeX-beamer-outer-themes-list ()
"Return a list of beamer outer themes for completion."
(cond ((eq LaTeX-beamer-outer-themes 'local)
- (set (make-local-variable 'LaTeX-beamer-outer-themes)
- (LaTeX-beamer-search-themes "^beameroutertheme")))
+ (setq-local LaTeX-beamer-outer-themes
+ (LaTeX-beamer-search-themes "^beameroutertheme")))
((functionp LaTeX-beamer-outer-themes)
(funcall LaTeX-beamer-outer-themes))
((listp LaTeX-beamer-outer-themes)
@@ -539,8 +538,8 @@ also be a string. Then the length of the string is used."
(defun LaTeX-beamer-color-themes-list ()
"Return a list of beamer color themes for completion."
(cond ((eq LaTeX-beamer-color-themes 'local)
- (set (make-local-variable 'LaTeX-beamer-color-themes)
- (LaTeX-beamer-search-themes "^beamercolortheme")))
+ (setq-local LaTeX-beamer-color-themes
+ (LaTeX-beamer-search-themes "^beamercolortheme")))
((functionp LaTeX-beamer-color-themes)
(funcall LaTeX-beamer-color-themes))
((listp LaTeX-beamer-color-themes)
@@ -552,8 +551,8 @@ also be a string. Then the length of the string is used."
(defun LaTeX-beamer-font-themes-list ()
"Return a list of beamer font themes for completion."
(cond ((eq LaTeX-beamer-font-themes 'local)
- (set (make-local-variable 'LaTeX-beamer-font-themes)
- (LaTeX-beamer-search-themes "^beamerfonttheme")))
+ (setq-local LaTeX-beamer-font-themes
+ (LaTeX-beamer-search-themes "^beamerfonttheme")))
((functionp LaTeX-beamer-font-themes)
(funcall LaTeX-beamer-font-themes))
((listp LaTeX-beamer-font-themes)
diff --git a/style/dcolumn.el b/style/dcolumn.el
index 8151f590..c168e595 100644
--- a/style/dcolumn.el
+++ b/style/dcolumn.el
@@ -1,6 +1,6 @@
;;; dcolumn.el --- AUCTeX style for `dcolumn.sty' (v1.06) -*-
lexical-binding: t; -*-
-;; Copyright (C) 2016, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2024 Free Software Foundation, Inc.
;; Author: Arash Esbati <ar...@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -38,8 +38,8 @@
(lambda ()
;; `dcolumn.sty' adds one new column specification letter:
- (set (make-local-variable 'LaTeX-array-column-letters)
- (concat LaTeX-array-column-letters "D"))
+ (setq-local LaTeX-array-column-letters
+ (concat LaTeX-array-column-letters "D"))
;; Also run style hook for `array':
(TeX-run-style-hooks "array"))
diff --git a/style/epigraph.el b/style/epigraph.el
index 14b276fe..b6087db8 100644
--- a/style/epigraph.el
+++ b/style/epigraph.el
@@ -1,6 +1,6 @@
;;; epigraph.el --- AUCTeX style for `epigraph.sty' v1.5c -*-
lexical-binding: t; -*-
-;; Copyright (C) 2012, 2017, 2018, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2012--2024 Free Software Foundation, Inc.
;; Author: Mads Jensen <m...@inducks.org>
;; Maintainer: auctex-devel@gnu.org
@@ -74,11 +74,10 @@
;; Append qitem to `LaTeX-item-regexp':
(unless (string-match "qitem" LaTeX-item-regexp)
- (set (make-local-variable 'LaTeX-item-regexp)
- (concat
- LaTeX-item-regexp
- "\\|"
- "qitem\\b"))
+ (setq-local LaTeX-item-regexp
+ (concat LaTeX-item-regexp
+ "\\|"
+ "qitem\\b"))
(LaTeX-set-paragraph-start))
;; Fontification:
diff --git a/style/exam.el b/style/exam.el
index eab9300d..92a6929b 100644
--- a/style/exam.el
+++ b/style/exam.el
@@ -1,6 +1,6 @@
;;; exam.el --- AUCTeX style for the (LaTeX) exam class -*- lexical-binding:
t; -*-
-;; Copyright (C) 2016--2022 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2024 Free Software Foundation, Inc.
;; Author: Uwe Brauer <o...@mat.ucm.es>
;; Created: 2016-03-06
@@ -127,15 +127,14 @@ Arguments NAME and TYPE are the same as for the function
;; Append us only once:
(unless (and (string-match "question" LaTeX-item-regexp)
(string-match "sub" LaTeX-item-regexp))
- (set (make-local-variable 'LaTeX-item-regexp)
- (concat
- LaTeX-item-regexp
- "\\|"
- "choice\\b"
- "\\|"
- "\\(titled\\)?question\\b"
- "\\|"
- "\\(sub\\)*part\\b"))
+ (setq-local LaTeX-item-regexp
+ (concat LaTeX-item-regexp
+ "\\|"
+ "choice\\b"
+ "\\|"
+ "\\(titled\\)?question\\b"
+ "\\|"
+ "\\(sub\\)*part\\b"))
(LaTeX-set-paragraph-start))
(TeX-add-symbols
diff --git a/style/hyperref.el b/style/hyperref.el
index 7c123a91..75349177 100644
--- a/style/hyperref.el
+++ b/style/hyperref.el
@@ -1,6 +1,6 @@
;;; hyperref.el --- AUCTeX style for `hyperref.sty' v6.83m -*-
lexical-binding: t; -*-
-;; Copyright (C) 2008, 2013-2022 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2024 Free Software Foundation, Inc.
;; Author: Ralf Angeli <ang...@caeruleus.net>
;; Maintainer: auctex-devel@gnu.org
@@ -234,10 +234,9 @@
'("hyperbaseurl" t)
'("hyperimage" "Image URL" "Text")
'("hyperdef" "Category" "Name" "Text")
- '("hyperref"
- (TeX-arg-conditional (y-or-n-p "Insert a label and text? ")
- ([TeX-arg-ref] "Text")
- ("URL" "Category" "Name" "Text")))
+ '("hyperref" (TeX-arg-conditional (y-or-n-p "Insert a label and text? ")
+ ([TeX-arg-ref] "Text")
+ ("URL" "Category" "Name" "Text")))
'("hyperlink" "Name" "Text")
'("hypertarget" "Name" "Text")
'("phantomsection" 0)
@@ -287,8 +286,8 @@
;; whole document is indented. Append it to a local version of
;; `LaTeX-document-regexp':
(unless (string-match-p "Form" LaTeX-document-regexp)
- (set (make-local-variable 'LaTeX-document-regexp)
- (concat LaTeX-document-regexp "\\|" "Form")))
+ (setq-local LaTeX-document-regexp
+ (concat LaTeX-document-regexp "\\|" "Form")))
(add-to-list 'LaTeX-verbatim-macros-with-braces-local "nolinkurl")
(add-to-list 'LaTeX-verbatim-macros-with-braces-local "hyperbaseurl")
diff --git a/style/l3doc.el b/style/l3doc.el
index a13f2179..53dc0ce6 100644
--- a/style/l3doc.el
+++ b/style/l3doc.el
@@ -1,6 +1,6 @@
;;; l3doc.el --- AUCTeX style for `l3doc.cls' -*- lexical-binding: t; -*-
-;; Copyright (C) 2022 Free Software Foundation, Inc.
+;; Copyright (C) 2022--2024 Free Software Foundation, Inc.
;; Author: Arash Esbati <ar...@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -209,9 +209,9 @@ For syntax environment from l3doc class."
;; document are indented. Append them to a local version of
;; `LaTeX-document-regexp':
(unless (string-match-p "\\<implementation\\>" LaTeX-document-regexp)
- (set (make-local-variable 'LaTeX-document-regexp)
- (concat LaTeX-document-regexp
- "\\|documentation\\|implementation")))
+ (setq-local LaTeX-document-regexp
+ (concat LaTeX-document-regexp
+ "\\|documentation\\|implementation")))
;; Append syntax to `LaTeX-item-list' with `LaTeX-item-l3doc-syntax'
(add-to-list 'LaTeX-item-list '("syntax" . LaTeX-item-l3doc-syntax) t)
diff --git a/style/ltugboat.el b/style/ltugboat.el
index c6eb07d0..8a451add 100644
--- a/style/ltugboat.el
+++ b/style/ltugboat.el
@@ -74,8 +74,8 @@
(LaTeX-add-environments '("appendix"))
(unless (string-match-p "appendix" LaTeX-document-regexp)
- (set (make-local-variable 'LaTeX-document-regexp)
- (concat LaTeX-document-regexp "\\|" "appendix")))
+ (setq-local LaTeX-document-regexp
+ (concat LaTeX-document-regexp "\\|" "appendix")))
(TeX-add-symbols
;; 7 Titles, addresses and so on
diff --git a/style/plext.el b/style/plext.el
index 26e564e5..6adae878 100644
--- a/style/plext.el
+++ b/style/plext.el
@@ -1,6 +1,6 @@
;;; plext.el --- AUCTeX style for the plext package. -*- lexical-binding: t;
-*-
-;; Copyright (C) 2014, 2020, 2022 Free Software Foundation, Inc.
+;; Copyright (C) 2014--2024 Free Software Foundation, Inc.
;; Author: Ikumi Keita <ik...@ikumi.que.jp>
;; Maintainer: auctex-devel@gnu.org
@@ -45,11 +45,12 @@
'("tabular" LaTeX-plext-env-array)
'("tabular*" LaTeX-plext-env-array))
- (set (make-local-variable 'LaTeX-array-skipping-regexp)
- (concat "\\(?:<[tyz]>\\)?[ \t]*" (regexp-opt '("[t]" "[b]" ""))))
- (set (make-local-variable 'LaTeX-tabular*-skipping-regexp)
- (concat "\\(?:<[tyz]>\\)?[ \t]*{[^}]*}[ \t]*"
- (regexp-opt '("[t]" "[b]" "")))))
+ (setq-local LaTeX-array-skipping-regexp
+ (concat "\\(?:<[tyz]>\\)?[ \t]*"
+ (regexp-opt '("[t]" "[b]" ""))))
+ (setq-local LaTeX-tabular*-skipping-regexp
+ (concat "\\(?:<[tyz]>\\)?[ \t]*{[^}]*}[ \t]*"
+ (regexp-opt '("[t]" "[b]" "")))))
TeX-dialect)
(defun LaTeX-plext-env-array (env)
diff --git a/style/siunitx.el b/style/siunitx.el
index cec13b59..c3f4c558 100644
--- a/style/siunitx.el
+++ b/style/siunitx.el
@@ -1,6 +1,6 @@
;;; siunitx.el --- AUCTeX style for `siunitx.sty' version 3.3.36. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2012-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2024 Free Software Foundation, Inc.
;; Maintainer: auctex-devel@gnu.org
;; Author: Mosè Giordano <m...@gnu.org>
@@ -468,8 +468,8 @@ string."
;; FIXME: 'siunitx.sty' adds only one new column specification
;; letter 'S' in v3 and 's' is removed. We keep 's' for older
;; documents and remove it sometimes later.
- (set (make-local-variable 'LaTeX-array-column-letters)
- (concat LaTeX-array-column-letters "S" "s"))
+ (setq-local LaTeX-array-column-letters
+ (concat LaTeX-array-column-letters "S" "s"))
(TeX-run-style-hooks "l3keys2e"
"array"
diff --git a/style/tabularx.el b/style/tabularx.el
index 970f698c..3aa790dd 100644
--- a/style/tabularx.el
+++ b/style/tabularx.el
@@ -1,6 +1,6 @@
;;; tabularx.el --- AUCTeX style for the tabularx package. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2009, 2013-2016, 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2009--2024 Free Software Foundation, Inc.
;; Author: Ralf Angeli <ang...@caeruleus.net>
;; Maintainer: auctex-devel@gnu.org
@@ -66,8 +66,8 @@
(TeX-run-style-hooks "array")
;; `tabularx.sty' adds one new column specification letter.
- (set (make-local-variable 'LaTeX-array-column-letters)
- (concat LaTeX-array-column-letters "X")))
+ (setq-local LaTeX-array-column-letters
+ (concat LaTeX-array-column-letters "X")))
TeX-dialect)
;;; tabularx.el ends here
diff --git a/style/tabulary.el b/style/tabulary.el
index 6b309e0e..a07a238f 100644
--- a/style/tabulary.el
+++ b/style/tabulary.el
@@ -1,6 +1,6 @@
;;; tabulary.el --- AUCTeX style for the tabulary package. -*-
lexical-binding: t; -*-
-;; Copyright (C) 2013-2016, 2020, 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2024 Free Software Foundation, Inc.
;; Author: Mads Jensen <m...@inducks.org>
;; Maintainer: auctex-devel@gnu.org
@@ -66,8 +66,8 @@
(TeX-run-style-hooks "array")
;; `tabulary.sty' adds some new column specification letters.
- (set (make-local-variable 'LaTeX-array-column-letters)
- (concat LaTeX-array-column-letters "L" "C" "R" "J")))
+ (setq-local LaTeX-array-column-letters
+ (concat LaTeX-array-column-letters "L" "C" "R" "J")))
TeX-dialect)
;;; tabulary.el ends here
diff --git a/style/tcolorboxlib-raster.el b/style/tcolorboxlib-raster.el
index 1d67761b..b41e2cd1 100644
--- a/style/tcolorboxlib-raster.el
+++ b/style/tcolorboxlib-raster.el
@@ -1,6 +1,6 @@
;;; tcolorboxlib-raster.el --- AUCTeX style for `raster' library from
tcolorbox -*- lexical-binding: t; -*-
-;; Copyright (C) 2016--2022 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2024 Free Software Foundation, Inc.
;; Author: Arash Esbati <ar...@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -138,11 +138,10 @@
;; Append tcbitem to `LaTeX-item-regexp':
(unless (string-match "tcbitem" LaTeX-item-regexp)
- (set (make-local-variable 'LaTeX-item-regexp)
- (concat
- LaTeX-item-regexp
- "\\|"
- "tcbitem\\b"))
+ (setq-local LaTeX-item-regexp
+ (concat LaTeX-item-regexp
+ "\\|"
+ "tcbitem\\b"))
(LaTeX-set-paragraph-start))
;; Fontification
diff --git a/style/tex-live.el b/style/tex-live.el
index 5fdb4eeb..0f347b87 100644
--- a/style/tex-live.el
+++ b/style/tex-live.el
@@ -1,6 +1,6 @@
;;; tex-live.el --- AUCTeX style for `tex-live.sty' -*- lexical-binding: t;
-*-
-;; Copyright (C) 2020--2022 Free Software Foundation, Inc.
+;; Copyright (C) 2020--2024 Free Software Foundation, Inc.
;; Author: Arash Esbati <ar...@gnu.org>
;; Maintainer: auctex-devel@gnu.org
@@ -138,8 +138,8 @@
'("lrBox"))
;; `tex-live.sty' adds one new column specification letter P:
- (set (make-local-variable 'LaTeX-array-column-letters)
- (concat LaTeX-array-column-letters "P"))
+ (setq-local LaTeX-array-column-letters
+ (concat LaTeX-array-column-letters "P"))
;; Custom env's where \item takes an opt. argument:
(let ((envs '("ttdescription" "cmddescription")))
