auctex-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[AUCTeX-diffs] GNU AUCTeX branch, master, updated. b42e932a4f7778f4cecc9


From: Tassilo Horn
Subject: [AUCTeX-diffs] GNU AUCTeX branch, master, updated. b42e932a4f7778f4cecc9a8354466461ae1e02b9
Date: Fri, 23 Oct 2020 17:59:25 -0400 (EDT)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, master has been updated
       via  b42e932a4f7778f4cecc9a8354466461ae1e02b9 (commit)
       via  19cdfe0b3af75eb6a3e9fc9401bacf67e7854906 (commit)
       via  9656d30f93fa4cfb2a9e4740d31f611f2b0f167c (commit)
       via  4c1430a5aa4edab3881f272fec765b6dfec326d7 (commit)
       via  08d01c11f1ff4e2a55fcceb55d3352e3c2c53b40 (commit)
       via  c3b76ca136f22b298ca66d0838b7b7cf1a310111 (commit)
       via  42f061a05fd2de0f28de50728f9caecd0eccd128 (commit)
       via  cebf8cc1e534d6fa5e883b5a874a6a37e32a9b88 (commit)
       via  c4583f0469a5536183a4018f802de5a75013991c (commit)
       via  e9af4f1b72ef7753677df3f3787af6528cc83641 (commit)
       via  9d0ccc18f3d1a18380af6dfa042d9a1259bf336a (commit)
       via  00b2d73641521b5d42b3e8a20ce32bf831700150 (commit)
       via  96c945a86349d900fe097a24f0cc2695dbfabeec (commit)
       via  ced4b1a930def4c7cd0a3e33141566b96e17fc70 (commit)
       via  2b9b3a8328ae3dcd828fd3ac397229efb8590fd3 (commit)
       via  384c1d2528eba44cd53d8ea42e151c7b4445bafd (commit)
       via  2e196d21b9ffd2fd2e9a0b130bf6129b1abbee4b (commit)
       via  717e5f0a9adc9945eb75191861f816fc1e8e9136 (commit)
       via  bf30c1106f87ed14ec09e9c735f37c071743c802 (commit)
       via  89515499379810aa6f89afb78d6bc128e62c9944 (commit)
       via  8afd11ee39949221dd2fa22182f961597a34b0e4 (commit)
       via  dabe30c9a957c9c0f9ca7aa309f1d370401fa91b (commit)
       via  f7c0c735d48c822a9df0ad486817084c9511d6bd (commit)
      from  ec4060edb52c64fe2ae47464ad74081bfe000937 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b42e932a4f7778f4cecc9a8354466461ae1e02b9
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Date:   Sun Oct 18 17:03:37 2020 +0900

    ; * style/graphicx.el: Fix Ataka-san's name and email.

diff --git a/style/graphicx.el b/style/graphicx.el
index be918bd..cfcba21 100644
--- a/style/graphicx.el
+++ b/style/graphicx.el
@@ -28,7 +28,7 @@
 ;; Acknowledgements
 ;;  Dr. Thomas Baumann <thomas.baumann@ch.tum.de>
 ;;  David Kastrup <David.Kastrup@t-online.de>
-;;  Masayuki Akata <ataka@milk.freemail.ne.jp>
+;;  Masayuki Ataka <masayuki.ataka@gmail.com>
 
 ;;; Code:
 

commit 19cdfe0b3af75eb6a3e9fc9401bacf67e7854906
Author: Arash Esbati <arash@gnu.org>
Date:   Fri Oct 16 19:58:32 2020 +0200

    Put point after the graphic file argrument
    
    * style/graphicx.el (LaTeX-includegraphics-extensions): Delimit
    the regexp with \\' instead of $.
    (LaTeX-arg-includegraphics): Rewrite the function in order to
    comply with AUCTeX insertion hooks.  Put point after the braced
    group once the file argument in inserted into buffer.

diff --git a/style/graphicx.el b/style/graphicx.el
index c24ee21..be918bd 100644
--- a/style/graphicx.el
+++ b/style/graphicx.el
@@ -171,7 +171,7 @@ Optional argument LIST if non-nil is used as list of 
regexps of
 extensions to be matched."
   (unless list
     (setq list (LaTeX-includegraphics-extensions-list)))
-  (concat "\\." (mapconcat #'identity list "$\\|\\.") "$"))
+  (concat "\\." (mapconcat #'identity list "\\'\\|\\.") "\\'"))
 
 (defvar LaTeX-includegraphics-global-files nil
   "List of the non-local graphic files to include in LaTeX documents.
@@ -213,21 +213,16 @@ subdirectories and inserts the relative file name.  See
          (string-match (LaTeX-includegraphics-extensions) fname))))
    (TeX-master-directory)))
 
-(defun LaTeX-arg-includegraphics (_prefix)
+(defun LaTeX-arg-includegraphics (optional)
   "Ask for mandantory argument for the \\includegraphics command."
-  (let* ((image-file (funcall LaTeX-includegraphics-read-file)))
-    (TeX-insert-braces 0)
-    (insert
+  (let ((image-file (funcall LaTeX-includegraphics-read-file)))
+    (TeX-argument-insert
      (if LaTeX-includegraphics-strip-extension-flag
-        ;; We don't have `replace-regexp-in-string' in all (X)Emacs versions:
-        (with-temp-buffer
-          (insert image-file)
-          (goto-char (point-max))
-          (when (search-backward-regexp (LaTeX-includegraphics-extensions)
-                                        nil t 1)
-            (replace-match ""))
-          (buffer-string))
-       image-file))))
+        (replace-regexp-in-string (LaTeX-includegraphics-extensions)
+                                  ""
+                                  image-file)
+       image-file)
+     optional)))
 
 (TeX-add-style-hook
  "graphicx"

commit 9656d30f93fa4cfb2a9e4740d31f611f2b0f167c
Author: Arash Esbati <arash@gnu.org>
Date:   Fri Oct 16 14:56:58 2020 +0200

    Fix insertion of unnecessary backslash
    
    * style/amsthm.el (LaTeX-arg-amsthm-fontdecl):
    * style/ntheorem.el (LaTeX-arg-ntheorem-fontdecl): Don't insert a
    backslash if the query for font declaration is left empty.

diff --git a/style/amsthm.el b/style/amsthm.el
index 569cef9..f7cc6bb 100644
--- a/style/amsthm.el
+++ b/style/amsthm.el
@@ -58,15 +58,16 @@
   "Prompt for font declaration commands in \"\\newtheoremstyle\".
 If OPTIONAL is non-nil, insert the resulting value as an optional
 argument.  Use PROMPT as the prompt string."
-  ;; `INITIAL-INPUT' (5th argument to `TeX-completing-read-multiple')
-  ;; is hard-coded to `TeX-esc'.
   (let* ((crm-separator (regexp-quote TeX-esc))
         (fontdecl (mapconcat #'identity
                              (TeX-completing-read-multiple
                               (TeX-argument-prompt optional prompt "Font: \\" 
t)
                               LaTeX-amsthm-fontdecl)
                              TeX-esc)))
-    (TeX-argument-insert fontdecl optional)))
+    (TeX-argument-insert fontdecl
+                        optional
+                        (when (and fontdecl (not (string= fontdecl "")))
+                          TeX-esc))))
 
 (defun LaTeX-amsthm-env-label (environment)
   "Insert ENVIRONMENT, query for an optional argument and prompt
@@ -161,7 +162,6 @@ make them available as new environments."
     '("theoremstyle"
       (TeX-arg-eval completing-read
                    (TeX-argument-prompt nil nil "Style")
-                   ;; LaTeX-amsthm-theoremstyle-list
                    (LaTeX-amsthm-newtheoremstyle-list)))
     "qedhere"
     "swapnumbers"
diff --git a/style/ntheorem.el b/style/ntheorem.el
index 03bdf4f..4886442 100644
--- a/style/ntheorem.el
+++ b/style/ntheorem.el
@@ -77,18 +77,19 @@ defined with \"\\newtheoremlisttype\".")
   "List of font declaration commands for \"\\newtheoremstyle\".")
 
 (defun LaTeX-arg-ntheorem-fontdecl (optional &optional prompt)
-  "Prompt for font declaration commands in \"\\theorem(body\|header)font\".
+  "Prompt for font declaration commands in \"\\theorem(body|header)font\".
 If OPTIONAL is non-nil, insert the resulting value as an optional
 argument.  Use PROMPT as the prompt string."
-  ;; `INITIAL-INPUT' (5th argument to `TeX-completing-read-multiple')
-  ;; is hard-coded to `TeX-esc'.
   (let* ((crm-separator (regexp-quote TeX-esc))
-        (fontdecl (mapconcat 'identity
+        (fontdecl (mapconcat #'identity
                              (TeX-completing-read-multiple
-                              (TeX-argument-prompt optional prompt "Font 
declaration")
-                              LaTeX-ntheorem-fontdecl nil nil TeX-esc)
+                              (TeX-argument-prompt optional prompt "Font 
declaration: \\" t)
+                              LaTeX-ntheorem-fontdecl)
                              TeX-esc)))
-    (TeX-argument-insert fontdecl optional)))
+    (TeX-argument-insert fontdecl
+                        optional
+                        (when (and fontdecl (not (string= fontdecl "")))
+                          TeX-esc))))
 
 (defun LaTeX-ntheorem-env-label (environment)
   "Insert ENVIRONMENT, query for an optional argument and prompt

commit 4c1430a5aa4edab3881f272fec765b6dfec326d7
Author: Arash Esbati <arash@gnu.org>
Date:   Mon Oct 12 22:20:47 2020 +0200

    Add new style/appendix.el
    
    * Makefile.in (STYLESRC): Add new style.
    
    * style/appendix.el: New file.

diff --git a/Makefile.in b/Makefile.in
index 63234c1..2315327 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -172,7 +172,8 @@ STYLESRC = style/prosper.el \
           style/changelog.el style/ltugboat.el  style/beamerswitch.el \
           style/multitoc.el  style/fbox.el      style/xkcdcolors.el \
           style/ltxguide.el  style/revtex4-2.el style/overpic.el \
-          style/tex-live.el  style/algorithm.el style/algpseudocode.el
+          style/tex-live.el  style/algorithm.el style/algpseudocode.el \
+          style/appendix.el
 
 STYLEELC = $(STYLESRC:.el=.elc)
 
diff --git a/style/appendix.el b/style/appendix.el
new file mode 100644
index 0000000..97cc6f6
--- /dev/null
+++ b/style/appendix.el
@@ -0,0 +1,76 @@
+;;; appendix.el --- AUCTeX style for `appendix.sty' (v1.2c)  -*- 
lexical-binding: t; -*-
+
+;; Copyright (C) 2020 Free Software Foundation, Inc.
+
+;; Author: Arash Esbati <arash@gnu.org>
+;; Maintainer: auctex-devel@gnu.org
+;; Created: 2020-10-10
+;; Keywords: tex
+
+;; This file is part of AUCTeX.
+
+;; AUCTeX is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 3, or (at your option)
+;; any later version.
+
+;; AUCTeX is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with AUCTeX; see the file COPYING.  If not, write to the Free
+;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+;; 02110-1301, USA.
+
+;;; Commentary:
+
+;; This file adds support for `appendix.sty' version 1.2c from
+;; 2020/02/08.
+
+;;; Code:
+
+(TeX-add-style-hook
+ "appendix"
+ (lambda ()
+
+   (TeX-add-symbols
+    "appendixpage"
+    "addappheadtotoc"
+    "noappendicestocpagenum"
+    "appendicestocpagenum"
+    "appendixname"
+    "appendixtocname"
+    "appendixpagename"
+
+    "appendixtocon"
+    "appendixtocoff"
+    "appendixpageon"
+    "appendixpageoff"
+    "appendixtitleon"
+    "appendixtitleoff"
+    "appendixtitletocon"
+    "appendixtitletocoff"
+    "appendixheaderon"
+    "appendixheaderoff"
+    "restoreapp"
+
+    "setthesection"
+    "setthesubsection")
+
+   (LaTeX-add-environments
+    '("appendices")
+    '("subappendices"))
+
+   ;; 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"))))
+ LaTeX-dialect)
+
+(defvar LaTeX-appendix-package-options '("toc" "page" "title"
+                                        "titletoc" "header")
+  "Package options for the appendix package.")
+
+;;; appendix.el ends here

commit 08d01c11f1ff4e2a55fcceb55d3352e3c2c53b40
Author: Arash Esbati <arash@gnu.org>
Date:   Mon Oct 12 21:46:14 2020 +0200

    ; * style/changelog.el: Silence the compiler for `reftex-label-alist'.

diff --git a/style/changelog.el b/style/changelog.el
index 616d418..ca5e8c2 100644
--- a/style/changelog.el
+++ b/style/changelog.el
@@ -35,6 +35,7 @@
 (declare-function font-latex-add-keywords
                  "font-latex"
                  (keywords class))
+(defvar reftex-label-alist)
 
 (defvar LaTeX-changelog-env-key-val-options
   '(("section" ("true" "false"))

commit c3b76ca136f22b298ca66d0838b7b7cf1a310111
Author: Arash Esbati <arash@gnu.org>
Date:   Sun Oct 4 16:10:45 2020 +0200

    * tex-ispell.el: Enable lexical-binding.

diff --git a/tex-ispell.el b/tex-ispell.el
index daf5094..50e9c80 100644
--- a/tex-ispell.el
+++ b/tex-ispell.el
@@ -1,6 +1,6 @@
-;;; tex-ispell.el --- AUCTeX skip additions for Ispell
+;;; tex-ispell.el --- AUCTeX skip additions for Ispell  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2016--2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org

commit 42f061a05fd2de0f28de50728f9caecd0eccd128
Author: Arash Esbati <arash@gnu.org>
Date:   Sun Oct 4 14:37:34 2020 +0200

    Improve style/amsthm.el
    
    * style/amsthm.el (LaTeX-amsthm-theoremstyle-list): Delete
    variable.
    (LaTeX-arg-amsthm-fontdecl): Adjust `prompt' in
    `TeX-argument-prompt' and don't use the 5. argument of
    `TeX-completing-read-multiple'.
    (LaTeX-amsthm-auto-cleanup): Remove the part for the deleted
    `LaTeX-amsthm-theoremstyle-list'.
    ("amsthm"): Use `LaTeX-add-amsthm-newtheoremstyles' for
    predefined styles.
    Adjust the hook for deleted variable.

diff --git a/style/amsthm.el b/style/amsthm.el
index b99fda8..569cef9 100644
--- a/style/amsthm.el
+++ b/style/amsthm.el
@@ -39,11 +39,6 @@
 (defvar LaTeX-amsthm-package-options nil
   "Package options for the amsthm package.")
 
-(defvar LaTeX-amsthm-theoremstyle-list
-  '(("plain") ("definition") ("remark"))
-  "List of theorem styles provided by `amsthm.el' and new ones
-defined with \"\\newtheoremstyle\".")
-
 (defvar LaTeX-amsthm-fontdecl
   '(;; family
     "rmfamily" "sffamily" "ttfamily"
@@ -66,10 +61,10 @@ argument.  Use PROMPT as the prompt string."
   ;; `INITIAL-INPUT' (5th argument to `TeX-completing-read-multiple')
   ;; is hard-coded to `TeX-esc'.
   (let* ((crm-separator (regexp-quote TeX-esc))
-        (fontdecl (mapconcat 'identity
+        (fontdecl (mapconcat #'identity
                              (TeX-completing-read-multiple
-                              (TeX-argument-prompt optional prompt "Font")
-                              LaTeX-amsthm-fontdecl nil nil TeX-esc)
+                              (TeX-argument-prompt optional prompt "Font: \\" 
t)
+                              LaTeX-amsthm-fontdecl)
                              TeX-esc)))
     (TeX-argument-insert fontdecl optional)))
 
@@ -114,14 +109,9 @@ RefTeX users should customize or add ENVIRONMENT to
 
 (defun LaTeX-amsthm-auto-cleanup ()
   "Move parsed results from `LaTeX-auto-amsthm-newtheorem' and
-make them available as new environments.  Update
-`LaTeX-amsthm-theoremstyle-list' with styles defined with
-\"\\newtheoremstyle\"."
-  (dolist (newthm (mapcar 'car (LaTeX-amsthm-newtheorem-list)))
-    (LaTeX-add-environments (list newthm 'LaTeX-amsthm-env-label)))
-  (dolist (newthmstyle (LaTeX-amsthm-newtheoremstyle-list))
-    (add-to-list (make-local-variable 'LaTeX-amsthm-theoremstyle-list)
-                newthmstyle)))
+make them available as new environments."
+  (dolist (newthm (mapcar #'car (LaTeX-amsthm-newtheorem-list)))
+    (LaTeX-add-environments (list newthm 'LaTeX-amsthm-env-label))))
 
 (add-hook 'TeX-auto-prepare-hook #'LaTeX-amsthm-auto-prepare t)
 (add-hook 'TeX-auto-cleanup-hook #'LaTeX-amsthm-auto-cleanup t)
@@ -130,8 +120,14 @@ make them available as new environments.  Update
 (TeX-add-style-hook
  "amsthm"
  (lambda ()
+   ;; Add the pre-defined styles:
+   (LaTeX-add-amsthm-newtheoremstyles "definition"
+                                     "plain"
+                                     "remark")
+
    (LaTeX-add-environments
     '("proof" LaTeX-amsthm-env-label))
+
    (TeX-add-symbols
     ;; Overrule the defintion in `latex.el':
     '("newtheorem"
@@ -163,8 +159,10 @@ make them available as new environments.  Update
           (format "%s" heading)))))
 
     '("theoremstyle"
-      (TeX-arg-eval completing-read "Style: "
-                   LaTeX-amsthm-theoremstyle-list))
+      (TeX-arg-eval completing-read
+                   (TeX-argument-prompt nil nil "Style")
+                   ;; LaTeX-amsthm-theoremstyle-list
+                   (LaTeX-amsthm-newtheoremstyle-list)))
     "qedhere"
     "swapnumbers"
 
@@ -174,14 +172,12 @@ make them available as new environments.  Update
         (let ((nthmstyle (TeX-read-string
                           (TeX-argument-prompt nil nil "Style name"))))
           (LaTeX-add-amsthm-newtheoremstyles nthmstyle)
-          (add-to-list (make-local-variable 'LaTeX-amsthm-theoremstyle-list)
-                       (list nthmstyle))
           (format "%s" nthmstyle))))
       (TeX-arg-length "Space above")
       (TeX-arg-length "Space below")
-      (LaTeX-arg-amsthm-fontdecl "Body font")
+      (LaTeX-arg-amsthm-fontdecl "Body font: \\")
       "Indent amount"
-      (LaTeX-arg-amsthm-fontdecl "Theorem head font")
+      (LaTeX-arg-amsthm-fontdecl "Theorem head font: \\")
       "Punctuation after head"
       (TeX-arg-length "Space after head")
       "Theorem head spec"))

commit cebf8cc1e534d6fa5e883b5a874a6a37e32a9b88
Author: Tassilo Horn <tsdh@gnu.org>
Date:   Sun Oct 4 09:53:16 2020 +0200

    Enable lexical-binding for texmathp.el
    
    * texmathp.el (texmathp-compile): Use `push' on places rather than `set' and
    `symbol-value' on locals partly pointing to symbols naming globals.

diff --git a/texmathp.el b/texmathp.el
index 733f639..37658f3 100644
--- a/texmathp.el
+++ b/texmathp.el
@@ -1,4 +1,4 @@
-;;; texmathp.el -- Code to check if point is inside LaTeX math environment
+;;; texmathp.el -- Code to check if point is inside LaTeX math environment  
-*- lexical-binding: t; -*-
 
 ;; Copyright (C) 1998, 2004, 2017, 2020 Free Software Foundation, Inc.
 
@@ -181,15 +181,14 @@ customize (customize calls it when setting the variable)."
   (setq texmathp-tex-commands1 (append texmathp-tex-commands
                                       texmathp-tex-commands-default))
   (let ((list (reverse texmathp-tex-commands1))
-       var entry type switches togglers)
+       entry type switches togglers)
     (while (setq entry (car list))
       (setq type (nth 1 entry)
-           list (cdr list)
-           var (cond ((memq type '(env-on env-off)) 'texmathp-environments)
-                     ((memq type '(arg-on arg-off)) 'texmathp-macros)
-                     ((memq type '(sw-on sw-off))   'switches)
-                     ((memq type '(sw-toggle))      'togglers)))
-      (set var (cons (car entry) (symbol-value var))))
+           list (cdr list))
+      (cond ((memq type '(env-on env-off)) (push (car entry) 
texmathp-environments))
+           ((memq type '(arg-on arg-off)) (push (car entry) texmathp-macros))
+           ((memq type '(sw-on sw-off))   (push (car entry) switches))
+           ((memq type '(sw-toggle))      (push (car entry) togglers))))
     (setq texmathp-onoff-regexp
          (concat "\\(?:[^\\]\\|\\`\\)"
                  (regexp-opt switches t))

commit c4583f0469a5536183a4018f802de5a75013991c
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Date:   Sun Oct 4 02:34:31 2020 +0900

    ; * tests/tex/command-expansion.el: Update copyright year.

diff --git a/tests/tex/command-expansion.el b/tests/tex/command-expansion.el
index 3b2779d..0bf661a 100644
--- a/tests/tex/command-expansion.el
+++ b/tests/tex/command-expansion.el
@@ -1,6 +1,6 @@
 ;;; command-expansion.el --- tests for TeX command expansion
 
-;; Copyright (C) 2014, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2018, 2020 Free Software Foundation, Inc.
 
 ;; This file is part of AUCTeX.
 

commit e9af4f1b72ef7753677df3f3787af6528cc83641
Author: Arash Esbati <arash@gnu.org>
Date:   Fri Oct 2 23:29:25 2020 +0200

    * style/fancyvrb.el: Replace dynamically bound `optional'.

diff --git a/style/fancyvrb.el b/style/fancyvrb.el
index 8cadec5..adc3b7d 100644
--- a/style/fancyvrb.el
+++ b/style/fancyvrb.el
@@ -267,7 +267,7 @@ RECUSTOM is non-nil, delete macros from the variable
                (TeX-arg-eval
                 (lambda ()
                   (let ((name (TeX-read-string
-                               (TeX-argument-prompt optional nil "Save 
name"))))
+                               (TeX-argument-prompt nil nil "Save name"))))
                     (LaTeX-add-fancyvrb-saveverbs name)
                     (format "%s" name))))
                TeX-arg-verb))
@@ -281,7 +281,7 @@ RECUSTOM is non-nil, delete macros from the variable
              `(,mac-name
                (TeX-arg-eval
                 completing-read
-                (TeX-argument-prompt optional nil "Saved name")
+                (TeX-argument-prompt nil nil "Saved name")
                 (LaTeX-fancyvrb-saveverb-list))))
             (when (and (fboundp 'font-latex-add-keywords)
                        (eq TeX-install-font-lock 'font-latex-setup))
@@ -536,11 +536,11 @@ ENV is the name of current environment as a string."
     '("Verb*" [TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local] 
TeX-arg-verb)
     '("DefineShortVerb" (TeX-arg-eval
                         TeX-read-string
-                        (TeX-argument-prompt optional nil "Character")
+                        (TeX-argument-prompt nil nil "Character")
                         TeX-esc))
     '("UndefineShortVerb" (TeX-arg-eval
                           TeX-read-string
-                          (TeX-argument-prompt optional nil "Character")
+                          (TeX-argument-prompt nil nil "Character")
                           TeX-esc))
     ;; Verbatim environments
     '("fvset" (TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local))
@@ -557,10 +557,10 @@ ENV is the name of current environment as a string."
       LaTeX-fancyvrb-arg-define-environment)
     '("RecustomVerbatimEnvironment"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Verbatim environment")
+                   (TeX-argument-prompt nil nil "Verbatim environment")
                    LaTeX-fancyvrb-base-environments)
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Based on environment")
+                   (TeX-argument-prompt nil nil "Based on environment")
                    LaTeX-fancyvrb-base-environments)
       (TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local))
 
@@ -575,22 +575,22 @@ ENV is the name of current environment as a string."
       (TeX-arg-eval
        (lambda ()
         (let ((name (TeX-read-string
-                     (TeX-argument-prompt optional nil "Save name"))))
+                     (TeX-argument-prompt nil nil "Save name"))))
           (LaTeX-add-fancyvrb-saveverbs name)
           (format "%s" name))))
       TeX-arg-verb)
     '("UseVerb" (TeX-arg-eval
                 completing-read
-                (TeX-argument-prompt optional nil "Saved name")
+                (TeX-argument-prompt nil nil "Saved name")
                 (LaTeX-fancyvrb-saveverb-list)))
     '("UseVerbatim" (TeX-arg-eval completing-read
-                                 (TeX-argument-prompt optional nil "Saved 
name")
+                                 (TeX-argument-prompt nil nil "Saved name")
                                  (LaTeX-fancyvrb-saveverbatim-list)))
     '("LUseVerbatim" (TeX-arg-eval completing-read
-                                  (TeX-argument-prompt optional nil "Saved 
name")
+                                  (TeX-argument-prompt nil nil "Saved name")
                                   (LaTeX-fancyvrb-saveverbatim-list)))
     '("BUseVerbatim" (TeX-arg-eval completing-read
-                                  (TeX-argument-prompt optional nil "Saved 
name")
+                                  (TeX-argument-prompt nil nil "Saved name")
                                   (LaTeX-fancyvrb-saveverbatim-list)))
 
     ;; Writing and reading verbatim files

commit 9d0ccc18f3d1a18380af6dfa042d9a1259bf336a
Author: Arash Esbati <arash@gnu.org>
Date:   Fri Oct 2 23:16:31 2020 +0200

    Update style/fancyvrb.el to package version 3.6
    
    * style/fancyvrb.el (LaTeX-fancyvrb-key-val-options): Add the
    "reflabel" key.
    (LaTeX-fancyvrb-env-reflabel-key-val)
    (LaTeX-fancyvrb-reftex-label-context-function): New functions.
    (LaTeX-fancyvrb-arg-define-environment): Use
    `LaTeX-fancyvrb-env-reflabel-key-val'.
    (LaTeX-fancyvrb-key-val-label-regexp): New variable added to
    AUCTeX parser.
    ("fancyvrb"): Run `font-latex-set-syntactic-keywords' in the hook
    if fontification is enabled.

diff --git a/style/fancyvrb.el b/style/fancyvrb.el
index ec34dc2..8cadec5 100644
--- a/style/fancyvrb.el
+++ b/style/fancyvrb.el
@@ -1,4 +1,4 @@
-;;; fancyvrb.el --- AUCTeX style for `fancyvrb.sty' version 3.0.  -*- 
lexical-binding: t; -*-
+;;; fancyvrb.el --- AUCTeX style for `fancyvrb.sty' version 3.6.  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2013, 2014, 2016-2018, 2020 Free Software Foundation, Inc.
 
@@ -25,7 +25,7 @@
 
 ;;; Commentary:
 
-;; This file adds support for `fancyvrb.sty' version 3.0.
+;; This file adds support for `fancyvrb.sty' version 3.6.
 
 ;; This style has some capabilities to parse user defined macros,
 ;; environments and saved blocks with `SaveVerbatim' environments and
@@ -41,6 +41,18 @@
 ;; The entries in `LaTeX-fancyvrb-key-val-options' cover also some
 ;; keys which are not mentioned in the manual of the package.
 
+;; Starting with version 3.6, fancyvrb.sty provides a `reflabel' key
+;; in the optional arguments which acts like a `\label' macro.  This
+;; key makes mostly sense for `\pageref'; referencing number of
+;; missing \caption's with `\ref' in a fancyvrb environment isn't
+;; useful.  This style provides support for AUCTeX and RefTeX in order
+;; to add and reference these labels.  When inserting an environment
+;; with `C-c C-e', choose `reflabel' key during the completion.  If
+;; you're using RefTeX and want to pass the label insertion job to it,
+;; simply leave the key value-less and proceed.  Otherwise enter the
+;; label value by yourself.  AUCTeX and RefTeX will parse the value
+;; and offer it for completion once a referencing macros is used.
+
 ;;; Code:
 
 ;; Needed for auto-parsing:
@@ -59,8 +71,7 @@
   `(("commentchar" ("none"))
     ("gobble")
     ("formatcom")
-    ;; Undocumented key
-    ("formatcom*")
+    ("formatcom*")    ; Undocumented key
     ("fontfamily" ("tt" "courier" "helvetica"))
     ("fontsize"   ("auto" "\\tiny" "\\scriptsize"
                   "\\footnotesize" "\\small" "\\normalsize"
@@ -93,11 +104,10 @@
     ("hfuzz")
     ("samepage" ("true" "false"))
     ("codes")
-    ;; Undocumented key
-    ("codes*")
+    ("codes*")        ; Undocumented key
     ("defineactive")
-    ;; Undocumented key
-    ("defineactive*")
+    ("defineactive*") ; Undocumented key
+    ("reflabel")
     ;; Undocumented key and introduced in version 2.81 2011/04/06
     ("vspace" ,(mapcar (lambda (x)
                         (concat TeX-esc (car x)))
@@ -355,16 +365,61 @@ update only various AUCTeX variables for verbatim 
environments."
             ;; (cond ...):
             (LaTeX-add-environments
              `(,env LaTeX-env-args
-                    [ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ]))
+                    [ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ]
+                    LaTeX-fancyvrb-env-reflabel-key-val))
             (LaTeX-add-environments
              `(,(concat env "*") LaTeX-env-args
-               [ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ]))
+               [ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ]
+               LaTeX-fancyvrb-env-reflabel-key-val))
             (add-to-list 'LaTeX-verbatim-environments-local (concat env "*"))
             (add-to-list 'LaTeX-indent-environment-list
-                         `(,(concat env "*") current-indentation) t)))
+                         `(,(concat env "*") current-indentation) t)
+            ;; Tell AUCTeX about label values to reflabel key:
+            (add-to-list 'LaTeX-label-alist
+                         (cons env 'LaTeX-listing-label) t)
+            (add-to-list 'LaTeX-label-alist
+                         (cons (concat env "*") 'LaTeX-listing-label) t)
+            (TeX-auto-add-regexp
+             `(,(concat  (regexp-quote TeX-esc)
+                         "begin[[:space:]]*"
+                         (regexp-quote TeX-grop)
+                         env
+                         "\\*?"
+                         (regexp-quote TeX-grcl)
+                         "[[:space:]]*"
+                         (LaTeX-extract-key-value-label "reflabel"))
+               1 LaTeX-auto-label))
+            ;; Tell RefTeX:
+            (when (and (fboundp 'reftex-add-label-environments)
+                       (boundp 'reftex-label-regexps))
+              (reftex-add-label-environments
+               `((,env
+                  ?l ,LaTeX-listing-label "~\\pageref{%s}"
+                  LaTeX-fancyvrb-reftex-label-context-function
+                  (regexp "[Ll]isting" "[Vv]erbatim"
+                          "[Cc]ode"    "Quell\\(code\\|text\\)"))
+
+                 (,(concat env "*")
+                  ?l ,LaTeX-listing-label "~\\pageref{%s}"
+                  LaTeX-fancyvrb-reftex-label-context-function
+                  (regexp "[Ll]isting" "[Vv]erbatim"
+                          "[Cc]ode"    "Quell\\(code\\|text\\)"))))
+              (add-to-list 'reftex-label-regexps
+                           (concat
+                            (regexp-quote TeX-esc)
+                            "begin[[:space:]]*"
+                            (regexp-quote TeX-grop)
+                            (concat env "\\*?")
+                            (regexp-quote TeX-grcl)
+                            "[[:space:]]*"
+                            (LaTeX-extract-key-value-label "reflabel" 1))
+                           t))))
       ;; These apply for all environments defined:
       (add-to-list 'LaTeX-verbatim-environments-local env)
       (add-to-list 'LaTeX-indent-environment-list `(,env current-indentation) 
t)))
+  ;; Update RefTeX:
+  (when (fboundp 'reftex-compile-variables)
+    (reftex-compile-variables))
   ;; Update font-lock:
   (when (and (fboundp 'font-latex-set-syntactic-keywords)
             (eq TeX-install-font-lock 'font-latex-setup))
@@ -379,6 +434,84 @@ If OPTIONAL is non-nil, insert the file name in brackets."
     (TeX-master-directory))
    optional))
 
+(defun LaTeX-fancyvrb-env-reflabel-key-val (_optional)
+  "Add a label value to reflabel key.
+This function checks if the reflabel key is given in the optional
+argument of a fancyvrb environment and then adds a label as value
+to that key.  The label value is inserted only if the key is
+value-less; user entered label values are recognized and
+respected.  OPTIONAL is ignored."
+  (let ((p (point-marker))
+       (s (make-marker)))
+    (set-marker s (save-excursion
+                   (LaTeX-find-matching-begin)
+                   (re-search-forward (regexp-quote LaTeX-optop)
+                                      (line-end-position)
+                                      t)))
+    ;; Search for the reflabel and a potential value:
+    (when (marker-position s)
+      (re-search-backward
+       (concat
+       "\\(\\<reflabel\\>\\)"
+       ;; Check if the key already has a label value:
+       "\\("
+       "[[:space:]]*=[[:space:]]*"
+       (regexp-quote TeX-grop)
+       "?"
+       "[[:alnum:]:._-]"
+       "\\)?")
+       s t)
+      ;; Insert a label value only if the key is value-less:
+      (when (and (not (match-string 2))
+                (match-string 1))
+       (goto-char (match-end 1))
+       (insert "="
+               TeX-grop
+               (format "%s" (LaTeX-label (LaTeX-current-environment)
+                                         'environment
+                                         t))
+               TeX-grcl)))
+    ;; At any rate, go to where we started and clean up:
+    (goto-char p)
+    (set-marker p nil)
+    (set-marker s nil)))
+
+(defun LaTeX-fancyvrb-reftex-label-context-function (env)
+  "Extract and return a context string for RefTeX.
+The context string is the first line of the verbatim environment.
+If no reflabel key is found, an error is issued.
+ENV is the name of current environment as a string."
+  (let* ((envstart (save-excursion
+                    (re-search-backward (concat "\\\\begin[[:space:]]*{"
+                                                env
+                                                "}")
+                                        nil t)))
+        (label-key (save-excursion
+                     (re-search-backward "\\<reflabel[ \t\n\r%]*=[ \t\n\r%]*"
+                                         envstart t))))
+    (if label-key
+       (save-excursion
+         (goto-char envstart)
+         (re-search-forward (regexp-quote LaTeX-optop) label-key t)
+         (up-list)
+         (forward-line)
+         ;; Return the first line of verbatim env:
+         (buffer-substring-no-properties (point)
+                                         (line-end-position)))
+      (error "No label found"))))
+
+(defvar LaTeX-fancyvrb-key-val-label-regexp
+  `(,(concat
+      (regexp-quote TeX-esc)
+      "begin[[:space:]]*"
+      (regexp-quote TeX-grop)
+      "[BL]?Verbatim\\*?"
+      (regexp-quote TeX-grcl)
+      "[[:space:]]*"
+      (LaTeX-extract-key-value-label "reflabel"))
+    1 LaTeX-auto-label)
+  "Matches the label inside an optional argument of fancyvrb environments.")
+
 (TeX-add-style-hook
  "fancyvrb"
  (lambda ()
@@ -386,6 +519,7 @@ If OPTIONAL is non-nil, insert the file name in brackets."
    (TeX-auto-add-regexp LaTeX-fancyvrb-environment-regexp)
    (TeX-auto-add-regexp LaTeX-fancyvrb-saveverb-regexp)
    (TeX-auto-add-regexp LaTeX-fancyvrb-saveverbatim-regexp)
+   (TeX-auto-add-regexp LaTeX-fancyvrb-key-val-label-regexp)
    (TeX-run-style-hooks
     "keyval")
 
@@ -469,17 +603,23 @@ If OPTIONAL is non-nil, insert the file name in brackets."
 
    (LaTeX-add-environments
     '("Verbatim" LaTeX-env-args
-      [TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local])
+      [TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local]
+      LaTeX-fancyvrb-env-reflabel-key-val)
     '("Verbatim*" LaTeX-env-args
-      [TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local])
+      [TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local]
+      LaTeX-fancyvrb-env-reflabel-key-val)
     '("BVerbatim" LaTeX-env-args
-      [TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local])
+      [TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local]
+      LaTeX-fancyvrb-env-reflabel-key-val)
     '("BVerbatim*" LaTeX-env-args
-      [TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local])
+      [TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local]
+      LaTeX-fancyvrb-env-reflabel-key-val)
     '("LVerbatim" LaTeX-env-args
-      [TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local])
+      [TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local]
+      LaTeX-fancyvrb-env-reflabel-key-val)
     '("LVerbatim*" LaTeX-env-args
-      [TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local])
+      [TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local]
+      LaTeX-fancyvrb-env-reflabel-key-val)
     '("SaveVerbatim"
       (lambda (env)
        (let ((options (TeX-read-key-val t 
LaTeX-fancyvrb-key-val-options-local))
@@ -501,6 +641,41 @@ If OPTIONAL is non-nil, insert the file name in brackets."
                     (concat LaTeX-optop options LaTeX-optcl))
                   (concat TeX-grop file TeX-grcl)))))))
 
+   (let ((envs '("BVerbatim" "BVerbatim*"
+                "LVerbatim" "LVerbatim*"
+                "Verbatim"  "Verbatim*")))
+     ;; Add pre-defined environments to `LaTeX-label-alist':
+     (dolist (env envs)
+       (add-to-list 'LaTeX-label-alist (cons env 'LaTeX-listing-label) t))
+
+     ;; Tell RefTeX
+     (when (and (fboundp 'reftex-add-label-environments)
+               (fboundp 'reftex-compile-variables)
+               (boundp 'reftex-label-regexps))
+       (dolist (env envs)
+        (reftex-add-label-environments
+         `((,env ?l ,LaTeX-listing-label "~\\pageref{%s}"
+                 LaTeX-fancyvrb-reftex-label-context-function
+                 (regexp "[Ll]isting" "[Vv]erbatim"
+                         "[Cc]ode"    "Quell\\(code\\|text\\)")))))
+
+       (unless (string-match "\\<reflabel"
+                            (mapconcat #'identity
+                                       reftex-label-regexps
+                                       "|"))
+        (make-local-variable 'reftex-label-regexps)
+        (add-to-list 'reftex-label-regexps
+                     (concat
+                      (regexp-quote TeX-esc)
+                      "begin[[:space:]]*"
+                      (regexp-quote TeX-grop)
+                      "[BL]?Verbatim\\*?"
+                      (regexp-quote TeX-grcl)
+                      "[[:space:]]*"
+                      (LaTeX-extract-key-value-label "reflabel" 1))
+                     t)
+        (reftex-compile-variables))))
+
    (LaTeX-add-counters
     "FancyVerbLine")
 
@@ -527,6 +702,7 @@ If OPTIONAL is non-nil, insert the file name in brackets."
 
    ;; Fontification
    (when (and (fboundp 'font-latex-add-keywords)
+             (fboundp 'font-latex-set-syntactic-keywords)
              (eq TeX-install-font-lock 'font-latex-setup))
      (font-latex-add-keywords '(("CustomVerbatimCommand"       "|{\\{{")
                                ("RecustomVerbatimCommand"     "|{\\{{")
@@ -546,7 +722,8 @@ If OPTIONAL is non-nil, insert the file name in brackets."
                                ("UseVerbatim"  "{")
                                ("LUseVerbatim" "{")
                                ("BUseVerbatim" "{"))
-                             'textual)))
+                             'textual)
+     (font-latex-set-syntactic-keywords)))
  LaTeX-dialect)
 
 (defvar LaTeX-fancyvrb-package-options nil

commit 00b2d73641521b5d42b3e8a20ce32bf831700150
Author: Arash Esbati <arash@gnu.org>
Date:   Fri Oct 2 22:20:08 2020 +0200

    Add missing argument to function body
    
    * style/thmtools.el (LaTeX-thmtools-declaretheoremstyle-key-val)
    (LaTeX-thmtools-declaretheorem-key-val): Add the missing `prompt'
    argument.

diff --git a/style/thmtools.el b/style/thmtools.el
index 334fccc..8de9c33 100644
--- a/style/thmtools.el
+++ b/style/thmtools.el
@@ -161,7 +161,8 @@ minibuffer.  PROMPT replaces the standard one."
        ("refname")
        ("Refname")
        ("shaded" ("textwidth" "bgcolor" "rulecolor" "rulewidth" "margin"))
-       ("thmbox" ("L" "M" "S"))))))
+       ("thmbox" ("L" "M" "S")))
+     prompt)))
 
 (defun LaTeX-arg-thmtools-declaretheorem (optional &optional prompt)
   "Insert the key=val and environment name defined by \\declaretheorem.
@@ -204,7 +205,8 @@ minibuffer.  PROMPT replaces the standard one."
        ("show" ,thms)
        ("ignoreall" ("true" "false"))
        ("showall" ("true" "false"))
-       ("title")))))
+       ("title"))
+     prompt)))
 
 (defun LaTeX-arg-thmtools-listoftheorems (optional &optional prompt)
   "Insert the key=val to \\listoftheorems macro.

commit 96c945a86349d900fe097a24f0cc2695dbfabeec
Author: Arash Esbati <arash@gnu.org>
Date:   Fri Oct 2 22:11:32 2020 +0200

    Remove `TeX-arg-none'
    
    * style/alphanum.el (TeX-arg-none): Remove function and use
    `TeX-arg-literal' instead.

diff --git a/style/alphanum.el b/style/alphanum.el
index 5a89422..0cac290 100644
--- a/style/alphanum.el
+++ b/style/alphanum.el
@@ -38,9 +38,6 @@
 (declare-function reftex-match-string "reftex" (n))
 (defvar reftex-section-regexp)
 
-(defun TeX-arg-none (arg)
-  (insert " "))
-
 (defun reftex-get-section-level-alphanum ()
   (save-excursion                      ; preserve position
     (save-match-data            ; preserve matching data (important!)
@@ -76,13 +73,15 @@
  "alphanum"
  (lambda ()
    (LaTeX-largest-level-set "chapter")
-   (TeX-add-symbols '("levelup" TeX-arg-none))
+   (TeX-add-symbols
+    '("levelup" (TeX-arg-literal " ")))
    (make-local-variable 'LaTeX-section-list)
    (LaTeX-section-list-add-locally
     '(("part" 0)
       ;; the levels don't make sense with alphanum, I randomly chose 0...
       ("toc" 0)
-      ("sub" 0)) t)
+      ("sub" 0))
+    t)
    (setq LaTeX-section-label
         '(("part" . "part:")
           ("toc" . "sec:")

commit ced4b1a930def4c7cd0a3e33141566b96e17fc70
Author: Arash Esbati <arash@gnu.org>
Date:   Fri Oct 2 21:36:49 2020 +0200

    Adapt styles to lexical-binding
    
    * style/arabxetex.el ("arabxetex"):
    * style/babel.el ("babel"):
    * style/doc.el ("doc"):
    * style/enumitem.el ("enumitem"):
    * style/exam.el ("exam"):
    * style/floatrow.el ("floatrow"):
    * style/fontspec.el ("fontspec"):
    * style/graphicx.el ("graphicx"):
    * style/hologo.el ("hologo"):
    * style/ltugboat.el ("ltugboat"):
    * style/mdframed.el ("mdframed"):
    * style/menukeys.el ("menukeys"):
    * style/moodle.el ("moodle"):
    * style/natbib.el ("natbib"):
    * style/ntheorem.el ("ntheorem"):
    * style/paracol.el ("paracol"):
    * style/pythontex.el ("pythontex"):
    * style/splitidx.el ("splitidx"):
    * style/tcolorbox.el ("tcolorbox"):
    * style/tex-live.el ("tex-live"):
    * style/thmtools.el ("thmtools"):
    * style/titleps.el ("titleps"):
    * style/titlesec.el ("titlesec"):
    * style/titletoc.el ("titletoc"):
    * style/xcolor.el ("xcolor"): Replace occurrences of dynamically
    bound `optional' with constant nil or t.
    
    * style/harvard.el ("harvard"): Remove unnecessary quoting of
    `lambda'.
    
    * style/xcolor.el (LaTeX-xcolor-color-models): Remove unnecessary
    `symbol-value'.

diff --git a/style/arabxetex.el b/style/arabxetex.el
index b912a81..249d7a4 100644
--- a/style/arabxetex.el
+++ b/style/arabxetex.el
@@ -65,7 +65,7 @@
            (lambda (symbol)
              (list symbol
                    [ TeX-arg-eval completing-read
-                                  (TeX-argument-prompt optional nil "Mode")
+                                  (TeX-argument-prompt t nil "Mode")
                                   LaTeX-arabxetex-package-options ]
                    t))
            (mapcar (lambda (lang) (concat "text" lang)) langs)))
@@ -77,7 +77,7 @@
              (list environment
                    #'LaTeX-env-args
                    [ TeX-arg-eval completing-read
-                                  (TeX-argument-prompt optional nil "Mode")
+                                  (TeX-argument-prompt t nil "Mode")
                                   LaTeX-arabxetex-package-options ]))
            langs))
      ;;
@@ -97,7 +97,7 @@
     ;; 3.3 Transliteration
     '("SetTranslitConvention"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Mapping")
+                   (TeX-argument-prompt nil nil "Mapping")
                    '("dmg" "loc")))
     '("SetTranslitStyle" "Style"))
 
diff --git a/style/babel.el b/style/babel.el
index 6c1cf4d..6468060 100644
--- a/style/babel.el
+++ b/style/babel.el
@@ -288,7 +288,7 @@
     '("defineshorthand"
       [ TeX-arg-eval mapconcat #'identity
                     (TeX-completing-read-multiple
-                     (TeX-argument-prompt optional nil "Language(s)")
+                     (TeX-argument-prompt t nil "Language(s)")
                      (LaTeX-babel-active-languages)) ""]
       t nil)
     '("aliasshorthand"   "Original" "Alias")
@@ -299,7 +299,7 @@
     ;; 1.12 The base option
     '("AfterBabelLanguage"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Language")
+                   (TeX-argument-prompt nil nil "Language")
                    LaTeX-babel-language-list)
       t)
 
@@ -307,11 +307,11 @@
     '("babelfont"
       [ TeX-arg-eval mapconcat #'identity
                     (TeX-completing-read-multiple
-                     (TeX-argument-prompt optional nil "Language(s)")
+                     (TeX-argument-prompt t nil "Language(s)")
                      LaTeX-babel-language-list)
                     "," ]
       (TeX-arg-eval let ((fontfam (completing-read
-                                  (TeX-argument-prompt optional nil "font 
family")
+                                  (TeX-argument-prompt nil nil "font family")
                                   '("rm" "sf" "tt"))))
                    ;; Make sure `tex-buf.el' is also loaded otherwise
                    ;; `TeX-check-engine-add-engines' is not defined.
@@ -332,7 +332,7 @@
     '("babelprovide"
       [ TeX-arg-key-val LaTeX-babel-babelprovide-key-val-options ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Language")
+                   (TeX-argument-prompt nil nil "Language")
                    LaTeX-babel-language-list))
 
     ;; 1.18 Getting the current language name
@@ -342,17 +342,17 @@
     ;; 1.19 Hyphenation and line breaking
     '("babelhyphen"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Type/Text")
+                   (TeX-argument-prompt nil nil "Type/Text")
                    '("soft" "hard" "repeat" "empty")))
     '("babelhyphen*"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Type/Text")
+                   (TeX-argument-prompt nil nil "Type/Text")
                    '("soft" "hard" "repeat" "empty")))
 
     '("babelhyphenation"
       [ TeX-arg-eval mapconcat #'identity
                     (TeX-completing-read-multiple
-                     (TeX-argument-prompt optional nil "Language(s)")
+                     (TeX-argument-prompt nil nil "Language(s)")
                      LaTeX-babel-language-list)
                     "," ]
       t)
diff --git a/style/doc.el b/style/doc.el
index 6311890..20e1486 100644
--- a/style/doc.el
+++ b/style/doc.el
@@ -86,7 +86,7 @@
     '("DescribeMacro" (TeX-arg-eval
                       (lambda ()
                         (let ((name (TeX-read-string
-                                     (TeX-argument-prompt optional nil "Macro")
+                                     (TeX-argument-prompt nil nil "Macro")
                                      TeX-esc)))
                           (format "%s" name)))))
     '("DescribeEnv" "Environment")
@@ -100,7 +100,7 @@
     '("cmd" (TeX-arg-eval
             (lambda ()
               (let ((name (TeX-read-string
-                           (TeX-argument-prompt optional nil "Name")
+                           (TeX-argument-prompt nil nil "Name")
                            TeX-esc)))
                 (format "%s" name)))))
     "makelabel"
diff --git a/style/enumitem.el b/style/enumitem.el
index b47aa25..3b80572 100644
--- a/style/enumitem.el
+++ b/style/enumitem.el
@@ -384,8 +384,8 @@ in `enumitem'-completions."
           (LaTeX-add-environments `(,name LaTeX-enumitem-env-with-opts))
           (LaTeX-add-enumitem-newlists (list name type))
           (TeX-ispell-skip-setcdr `((,name ispell-tex-arg-end 0)))
-          (TeX-argument-insert name optional)
-          (TeX-argument-insert type optional)
+          (TeX-argument-insert name nil)
+          (TeX-argument-insert type nil)
           (format "%s" depth)))))
 
     ;; \renewlist{<name>}{<type>}{<max-depth>}
@@ -401,7 +401,7 @@ in `enumitem'-completions."
     '("setlist"
       [TeX-arg-eval mapconcat #'identity
                    (TeX-completing-read-multiple
-                    (TeX-argument-prompt optional nil "Environment(s), 
level(s)")
+                    (TeX-argument-prompt t nil "Environment(s), level(s)")
                     (append
                      (when (LaTeX-provided-package-options-member "enumitem"
                                                                   
"includedisplayed")
@@ -418,7 +418,7 @@ in `enumitem'-completions."
     '("setlist*"
       [TeX-arg-eval mapconcat #'identity
                    (TeX-completing-read-multiple
-                    (TeX-argument-prompt optional nil "Environment(s), 
level(s)")
+                    (TeX-argument-prompt t nil "Environment(s), level(s)")
                     (append
                      (when (LaTeX-provided-package-options-member "enumitem"
                                                                   
"includedisplayed")
diff --git a/style/exam.el b/style/exam.el
index 1dd7b2b..0cfb512 100644
--- a/style/exam.el
+++ b/style/exam.el
@@ -140,59 +140,59 @@ Arguments NAME and TYPE are the same as for the function
     '("subpart" [ "Points" ] (TeX-arg-literal " "))
     '("gradetable"
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Orientation")
+                     (TeX-argument-prompt t nil "Orientation")
                      '("v" "h") ]
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Table index")
+                     (TeX-argument-prompt t nil "Table index")
                      '("questions" "pages") ] )
     '("bonusgradetable"
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Orientation")
+                     (TeX-argument-prompt t nil "Orientation")
                      '("v" "h") ]
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Table index")
+                     (TeX-argument-prompt t nil "Table index")
                      '("questions" "pages") ] )
     '("bonuspointtable"
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Orientation")
+                     (TeX-argument-prompt t nil "Orientation")
                      '("v" "h") ]
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Table index")
+                     (TeX-argument-prompt t nil "Table index")
                      '("questions" "pages") ] )
     '("partialgradetable"
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Orientation")
+                     (TeX-argument-prompt t nil "Orientation")
                      '("v" "h") ]
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Table index")
+                     (TeX-argument-prompt t nil "Table index")
                      '("questions" "pages") ] )
     '("partialbonusgradetable"
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Orientation")
+                     (TeX-argument-prompt t nil "Orientation")
                      '("v" "h") ]
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Table index")
+                     (TeX-argument-prompt t nil "Table index")
                      '("questions" "pages") ] )
     '("partialbonuspointtable"
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Orientation")
+                     (TeX-argument-prompt t nil "Orientation")
                      '("v" "h") ]
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Table index")
+                     (TeX-argument-prompt t nil "Table index")
                      '("questions" "pages") ] )
     '("pointtable"
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Orientation")
+                     (TeX-argument-prompt t nil "Orientation")
                      '("v" "h") ]
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Table index")
+                     (TeX-argument-prompt t nil "Table index")
                      '("questions" "pages") ] )
     '("partialpointtable"
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Orientation")
+                     (TeX-argument-prompt t nil "Orientation")
                      '("v" "h") ]
       [ TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Table index")
+                     (TeX-argument-prompt t nil "Table index")
                      '("questions" "pages") ] )
 
     '("subsubpart" [ "Points" ] (TeX-arg-literal " "))
diff --git a/style/floatrow.el b/style/floatrow.el
index 6dfc25b..9bf6838 100644
--- a/style/floatrow.el
+++ b/style/floatrow.el
@@ -557,10 +557,10 @@ only the parsed items."
     ;; \floatbox[<preamble>]{<captype>}[<width>][<height>][<vert 
pos>]{<caption>}{<object>}
     '("floatbox"
       [ TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Preamble")
+                    (TeX-argument-prompt t nil "Preamble")
                     '("\\capbeside" "\\nocapbeside" "\\captop") ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Float type")
+                   (TeX-argument-prompt nil nil "Float type")
                    LaTeX-floatrow-supported-float-types)
       LaTeX-floatrow-arg-floatbox)
 
@@ -569,22 +569,22 @@ only the parsed items."
       (TeX-arg-eval
        (lambda ()
         (let ((cmd (TeX-read-string
-                    (TeX-argument-prompt optional nil "Command"))))
+                    (TeX-argument-prompt nil nil "Command"))))
           (LaTeX-add-floatrow-newfloatcommands cmd)
           (TeX-add-symbols
            `(,cmd LaTeX-floatrow-arg-floatbox))
           (format "%s" cmd))))
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Float type")
+                   (TeX-argument-prompt nil nil "Float type")
                    '("figure" "table"))
       [ 2 ])
 
     '("renewfloatcommand"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Command")
+                   (TeX-argument-prompt nil nil "Command")
                    (LaTeX-floatrow-newfloatcommand-list))
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Float type")
+                   (TeX-argument-prompt nil nil "Float type")
                    '("figure" "table"))
       [ 2 ])
 
@@ -609,7 +609,7 @@ only the parsed items."
     ;; 3 Float Layout Settings
     '("floatsetup"
       [ TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Float type")
+                    (TeX-argument-prompt t nil "Float type")
                     LaTeX-floatrow-supported-float-types ]
       (TeX-arg-key-val LaTeX-floatrow-key-val-options-local))
 
@@ -620,7 +620,7 @@ only the parsed items."
     ;; 3.3 Clearing of Settings for Current Float Type
     '("clearfloatsetup"
       (TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Float type")
+                    (TeX-argument-prompt nil nil "Float type")
                     LaTeX-floatrow-supported-float-types))
 
     ;; 3.4 Temporary Clearing of All Float Settings
diff --git a/style/fontspec.el b/style/fontspec.el
index 18c5305..b4378ca 100644
--- a/style/fontspec.el
+++ b/style/fontspec.el
@@ -332,13 +332,13 @@ to retrieve the list of fonts."
     ;; 23 Defining new features
     '("newAATfeature"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Existing feature")
+                   (TeX-argument-prompt nil nil "Existing feature")
                    LaTeX-fontspec-font-features-local)
       "New option" 2)
 
     '("newopentypefeature"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Existing feature")
+                   (TeX-argument-prompt nil nil "Existing feature")
                    LaTeX-fontspec-font-features-local)
       "New option" t)
 
@@ -351,7 +351,7 @@ to retrieve the list of fonts."
     ;; 26 Renaming existing features & options
     '("aliasfontfeature"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Existing feature")
+                   (TeX-argument-prompt nil nil "Existing feature")
                    LaTeX-fontspec-font-features-local)
       "New name")
 
@@ -359,12 +359,12 @@ to retrieve the list of fonts."
       (TeX-arg-eval
        (lambda ()
         (let* ((key (completing-read
-                     (TeX-argument-prompt optional nil "Feature")
+                     (TeX-argument-prompt nil nil "Feature")
                      LaTeX-fontspec-font-features-local))
                (val (completing-read
-                     (TeX-argument-prompt optional nil "Existing name")
+                     (TeX-argument-prompt nil nil "Existing name")
                      (cadr (assoc key LaTeX-fontspec-font-features-local)))))
-          (TeX-argument-insert key optional)
+          (TeX-argument-insert key nil)
           (format "%s" val))))
       "New name") )
 
diff --git a/style/graphicx.el b/style/graphicx.el
index 732388f..c24ee21 100644
--- a/style/graphicx.el
+++ b/style/graphicx.el
@@ -237,13 +237,13 @@ subdirectories and inserts the relative file name.  See
 
     '("resizebox"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Width")
+                   (TeX-argument-prompt nil nil "Width")
                    (append '("\\width" "!")
                            (mapcar
                             (lambda (x) (concat TeX-esc (car x)))
                             (LaTeX-length-list))))
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Height")
+                   (TeX-argument-prompt nil nil "Height")
                    (append '("\\height" "\\totalheight" "\\depth" "!")
                            (mapcar
                             (lambda (x) (concat TeX-esc (car x)))
@@ -252,13 +252,13 @@ subdirectories and inserts the relative file name.  See
 
     '("resizebox*"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Width")
+                   (TeX-argument-prompt nil nil "Width")
                    (append '("\\width" "!")
                            (mapcar
                             (lambda (x) (concat TeX-esc (car x)))
                             (LaTeX-length-list))))
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Height")
+                   (TeX-argument-prompt nil nil "Height")
                    (append '("\\height" "\\totalheight" "\\depth" "!")
                            (mapcar
                             (lambda (x) (concat TeX-esc (car x)))
@@ -267,19 +267,19 @@ subdirectories and inserts the relative file name.  See
 
     '("rotatebox" (TeX-arg-conditional (member "graphics" (TeX-style-list))
                                       ()
-                                    ([ TeX-arg-key-val (("x") ("y") ("origin") 
("units")) ]))
+                                      ([ TeX-arg-key-val (("x") ("y") 
("origin") ("units")) ]))
       "Angle" "Argument")
 
     '("scalebox" "Horizontal scale" [ "Vertical scale" ] "Argument")
 
     '("includegraphics" (TeX-arg-conditional (member "graphics" 
(TeX-style-list))
                                             (["llx,lly"] ["urx,ury"])
-                                          ([ 
LaTeX-arg-graphicx-includegraphics-key-val ]))
+                                            ([ 
LaTeX-arg-graphicx-includegraphics-key-val ]))
       LaTeX-arg-includegraphics)
 
     '("includegraphics*" (TeX-arg-conditional (member "graphics" 
(TeX-style-list))
                                              (["llx,lly"] ["urx,ury"])
-                                           ([ 
LaTeX-arg-graphicx-includegraphics-key-val ]))
+                                             ([ 
LaTeX-arg-graphicx-includegraphics-key-val ]))
       LaTeX-arg-includegraphics)
 
     '("graphicspath" t)
diff --git a/style/harvard.el b/style/harvard.el
index 7c3d468..8574883 100644
--- a/style/harvard.el
+++ b/style/harvard.el
@@ -27,85 +27,85 @@
 
 (TeX-add-style-hook
  "harvard"
- #'(lambda ()
-
-     (LaTeX-add-environments
-      '("thebibliography" LaTeX-env-harvardbib ignore))
-
-     (TeX-add-symbols
-      "harvardand"
-      '("citeasnoun"
-       (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
-       TeX-arg-cite)
-      '("possessivecite"
-       (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
-       TeX-arg-cite)
-      '("citeaffixed"
-       (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
-       TeX-arg-cite "Affix")
-      '("citeyear"
-       (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
-       TeX-arg-cite)
-      '("citename"
-       (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
-       TeX-arg-cite)
-      '("citationstyle"
-       (TeX-arg-eval completing-read "Citation style: " '(("agsm") ("dcu"))))
-      '("citationmode"
-       (TeX-arg-eval completing-read "Citation mode: "
-                     '(("full") ("abbr") ("default"))))
-      '("harvardparenthesis"
-       (TeX-arg-eval completing-read "Harvardparenthesis: "
-                     '(("round") ("curly") ("angle") ("square"))))
-      '("bibliographystyle"
-       (TeX-arg-eval
-        completing-read "Bibliography style: "
-        '(("agsm") ("apsr") ("dcu") ("jmr") ("jphysicsB") ("kluwer") 
("nederlands") ("econometrica")))
-       ignore)
-      '("harvarditem" [ "Short citation" ]
-       "Complete citation" "Year" TeX-arg-define-cite))
-
-     (setq TeX-complete-list
-          (append '(("\\\\citeasnoun\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
-                     1 LaTeX-bibitem-list "}")
-                    ("\\\\citeasnoun{\\([^{}\n\r\\%,]*\\)" 1
-                     LaTeX-bibitem-list "}")
-                    
("\\\\possessivecite\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
-                     1 LaTeX-bibitem-list "}")
-                    ("\\\\possessivecite{\\([^{}\n\r\\%,]*\\)" 1
-                     LaTeX-bibitem-list "}")
-                    ("\\\\citename\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
-                     1 LaTeX-bibitem-list "}")
-                    ("\\\\citename{\\([^{}\n\r\\%,]*\\)" 1
-                     LaTeX-bibitem-list "}")
-                    ("\\\\citeaffixed\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
-                     1 LaTeX-bibitem-list "}")
-                    ("\\\\citeaffixed{\\([^{}\n\r\\%,]*\\)" 1
-                     LaTeX-bibitem-list "}")
-                    ("\\\\citeaffixed{\\([^{}\n\r\\%]*,\\)\\([^{}\n\r\\%,]*\\)"
-                     2 LaTeX-bibitem-list)
-                    ("\\\\citeyear\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
-                     1 LaTeX-bibitem-list "}")
-                    ("\\\\citeyear{\\([^{}\n\r\\%,]*\\)" 1
-                     LaTeX-bibitem-list "}")
-                    ("\\\\citeyear{\\([^{}\n\r\\%]*,\\)\\([^{}\n\r\\%,]*\\)"
-                     2 LaTeX-bibitem-list))
-                  TeX-complete-list))
-
-     (setq LaTeX-auto-regexp-list
-          (append '(("\\\\harvarditem{\\([a-zA-Z][^%#'()={}]*\\)}{\\([0-9][^, 
%\"#'()={}]*\\)}{\\([a-zA-Z][^, %\"#'()={}]*\\)}" 3 LaTeX-auto-bibitem)
-                    
("\\\\harvarditem\\[[^][\n\r]+\\]{\\([a-zA-Z][^%#'()={}]*\\)}{\\([0-9][^, 
%\"#'()={}]*\\)}{\\([a-zA-Z][^, %\"#'()={}]*\\)}" 3 LaTeX-auto-bibitem)
-                    )
-                  LaTeX-auto-regexp-list))
-
-     (setq LaTeX-item-list
-          (cons '("thebibliography" . LaTeX-item-harvardbib)
-                LaTeX-item-list))
-
-     ;; Tell RefTeX
-     (when (and LaTeX-reftex-cite-format-auto-activate
-               (fboundp 'reftex-set-cite-format))
-       (reftex-set-cite-format 'harvard)))
+ (lambda ()
+
+   (LaTeX-add-environments
+    '("thebibliography" LaTeX-env-harvardbib ignore))
+
+   (TeX-add-symbols
+    "harvardand"
+    '("citeasnoun"
+      (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
+      TeX-arg-cite)
+    '("possessivecite"
+      (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
+      TeX-arg-cite)
+    '("citeaffixed"
+      (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
+      TeX-arg-cite "Affix")
+    '("citeyear"
+      (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
+      TeX-arg-cite)
+    '("citename"
+      (TeX-arg-conditional TeX-arg-cite-note-p ([ "Note" ]) nil)
+      TeX-arg-cite)
+    '("citationstyle"
+      (TeX-arg-eval completing-read "Citation style: " '(("agsm") ("dcu"))))
+    '("citationmode"
+      (TeX-arg-eval completing-read "Citation mode: "
+                   '(("full") ("abbr") ("default"))))
+    '("harvardparenthesis"
+      (TeX-arg-eval completing-read "Harvardparenthesis: "
+                   '(("round") ("curly") ("angle") ("square"))))
+    '("bibliographystyle"
+      (TeX-arg-eval
+       completing-read "Bibliography style: "
+       '(("agsm") ("apsr") ("dcu") ("jmr") ("jphysicsB") ("kluwer") 
("nederlands") ("econometrica")))
+      ignore)
+    '("harvarditem" [ "Short citation" ]
+      "Complete citation" "Year" TeX-arg-define-cite))
+
+   (setq TeX-complete-list
+        (append '(("\\\\citeasnoun\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
+                   1 LaTeX-bibitem-list "}")
+                  ("\\\\citeasnoun{\\([^{}\n\r\\%,]*\\)" 1
+                   LaTeX-bibitem-list "}")
+                  ("\\\\possessivecite\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
+                   1 LaTeX-bibitem-list "}")
+                  ("\\\\possessivecite{\\([^{}\n\r\\%,]*\\)" 1
+                   LaTeX-bibitem-list "}")
+                  ("\\\\citename\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
+                   1 LaTeX-bibitem-list "}")
+                  ("\\\\citename{\\([^{}\n\r\\%,]*\\)" 1
+                   LaTeX-bibitem-list "}")
+                  ("\\\\citeaffixed\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
+                   1 LaTeX-bibitem-list "}")
+                  ("\\\\citeaffixed{\\([^{}\n\r\\%,]*\\)" 1
+                   LaTeX-bibitem-list "}")
+                  ("\\\\citeaffixed{\\([^{}\n\r\\%]*,\\)\\([^{}\n\r\\%,]*\\)"
+                   2 LaTeX-bibitem-list)
+                  ("\\\\citeyear\\[[^]\n\r\\%]*\\]{\\([^{}\n\r\\%,]*\\)"
+                   1 LaTeX-bibitem-list "}")
+                  ("\\\\citeyear{\\([^{}\n\r\\%,]*\\)" 1
+                   LaTeX-bibitem-list "}")
+                  ("\\\\citeyear{\\([^{}\n\r\\%]*,\\)\\([^{}\n\r\\%,]*\\)"
+                   2 LaTeX-bibitem-list))
+                TeX-complete-list))
+
+   (setq LaTeX-auto-regexp-list
+        (append '(("\\\\harvarditem{\\([a-zA-Z][^%#'()={}]*\\)}{\\([0-9][^, 
%\"#'()={}]*\\)}{\\([a-zA-Z][^, %\"#'()={}]*\\)}" 3 LaTeX-auto-bibitem)
+                  
("\\\\harvarditem\\[[^][\n\r]+\\]{\\([a-zA-Z][^%#'()={}]*\\)}{\\([0-9][^, 
%\"#'()={}]*\\)}{\\([a-zA-Z][^, %\"#'()={}]*\\)}" 3 LaTeX-auto-bibitem)
+                  )
+                LaTeX-auto-regexp-list))
+
+   (setq LaTeX-item-list
+        (cons '("thebibliography" . LaTeX-item-harvardbib)
+              LaTeX-item-list))
+
+   ;; Tell RefTeX
+   (when (and LaTeX-reftex-cite-format-auto-activate
+             (fboundp 'reftex-set-cite-format))
+     (reftex-set-cite-format 'harvard)))
  LaTeX-dialect)
 
 (defun LaTeX-env-harvardbib (environment &optional _ignore)
diff --git a/style/hologo.el b/style/hologo.el
index 6e1b1b2..bc0d759 100644
--- a/style/hologo.el
+++ b/style/hologo.el
@@ -140,7 +140,7 @@
                                        LaTeX-hologo-key-val-options-global))
                               (t
                                LaTeX-hologo-key-val-options-global)))))
-          (TeX-argument-insert logo optional)
+          (TeX-argument-insert logo nil)
           (format "%s" keyval)))))
 
     '("hologoDriverSetup" (TeX-arg-eval completing-read
@@ -184,7 +184,7 @@
                                '(("logo")))
                               (t
                                nil)))))
-          (TeX-argument-insert logo optional)
+          (TeX-argument-insert logo nil)
           (format "%s" keyval)))))
 
     ;; Additional user macros
diff --git a/style/ltugboat.el b/style/ltugboat.el
index cf73128..d49371a 100644
--- a/style/ltugboat.el
+++ b/style/ltugboat.el
@@ -238,12 +238,12 @@
     ;; 10.2 Other special typesetting
     '("Dash" 0)
     '("cs" (TeX-arg-eval let ((macro (completing-read
-                                     (TeX-argument-prompt optional nil
+                                     (TeX-argument-prompt nil nil
                                                           "Command")
                                      (TeX-symbol-list))))
                         (format "%s" macro)))
     '("env" (TeX-arg-eval let ((env (completing-read
-                                    (TeX-argument-prompt optional nil
+                                    (TeX-argument-prompt nil nil
                                                          "Environment")
                                     (LaTeX-environment-list))))
                          (format "%s" env)))
@@ -254,7 +254,7 @@
     ;; 12 Bibliography
     '("SetBibJustification"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Justification")
+                   (TeX-argument-prompt nil nil "Justification")
                    '("\\raggedright"  "\\sloppy"))))
 
    ;; Fontification
diff --git a/style/mdframed.el b/style/mdframed.el
index 9f9c251..aaf449f 100644
--- a/style/mdframed.el
+++ b/style/mdframed.el
@@ -302,7 +302,7 @@
       (TeX-arg-eval
        (lambda ()
         (let ((env (TeX-read-string
-                    (TeX-argument-prompt optional nil "Environment"))))
+                    (TeX-argument-prompt nil nil "Environment"))))
           (LaTeX-add-environments
            `(,env LaTeX-env-args [ TeX-arg-key-val 
LaTeX-mdframed-key-val-options-local ]))
           ;; Add new env's to `ispell-tex-skip-alist': skip the optional 
argument
@@ -312,7 +312,7 @@
     '("renewmdenv"
       [ TeX-arg-key-val LaTeX-mdframed-key-val-options-local ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Environment")
+                   (TeX-argument-prompt nil nil "Environment")
                    (LaTeX-mdframed-newmdenv-list)))
 
     '("surroundwithmdframed"
@@ -321,7 +321,7 @@
 
     '("mdflength"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Length")
+                   (TeX-argument-prompt nil nil "Length")
                    '(("skipabove")
                      ("skipbelow")
                      ("leftmargin")
@@ -340,7 +340,7 @@
       (TeX-arg-eval
        (lambda ()
         (let ((style (TeX-read-string
-                      (TeX-argument-prompt optional nil "Style name"))))
+                      (TeX-argument-prompt nil nil "Style name"))))
           (LaTeX-add-mdframed-mdfdefinestyles style)
           (LaTeX-mdframed-update-style-key)
           (format "%s" style))))
@@ -348,7 +348,7 @@
 
     '("mdfapptodefinestyle"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Style name")
+                   (TeX-argument-prompt nil nil "Style name")
                    (LaTeX-mdframed-mdfdefinestyle-list))
       (TeX-arg-key-val LaTeX-mdframed-key-val-options-local))
 
@@ -363,7 +363,7 @@
       (TeX-arg-eval
        (lambda ()
         (let ((nthm (TeX-read-string
-                     (TeX-argument-prompt optional nil "Environment"))))
+                     (TeX-argument-prompt nil nil "Environment"))))
           (LaTeX-add-environments (list nthm (vector "Heading")))
           (format "%s" nthm))))
       [ TeX-arg-environment "Numbered like" ]
@@ -379,7 +379,7 @@
       (TeX-arg-eval
        (lambda ()
         (let ((nthm (TeX-read-string
-                     (TeX-argument-prompt optional nil "Environment"))))
+                     (TeX-argument-prompt nil nil "Environment"))))
           (LaTeX-add-environments (list nthm (vector "Heading"))
                                   (list (concat nthm "*") (vector "Heading")))
           (format "%s" nthm))))
diff --git a/style/menukeys.el b/style/menukeys.el
index 4260250..2a10dfe 100644
--- a/style/menukeys.el
+++ b/style/menukeys.el
@@ -113,7 +113,7 @@ from the variable `TeX-symbol-list' before being re-added."
              (assq-delete-all (car (assoc macro (TeX-symbol-list))) 
TeX-symbol-list)))
       (TeX-add-symbols
        `(,macro [ TeX-arg-eval completing-read
-                              (TeX-argument-prompt optional nil
+                              (TeX-argument-prompt t nil
                                                    ,(concat "Input separator "
                                                             "(default "
                                                             (if (and sep (not 
(string= sep "")))
@@ -158,7 +158,7 @@ macro.  If RENEW is non-nil, query for an already defined 
macro."
            (assq-delete-all (car (assoc macro (TeX-symbol-list))) 
TeX-symbol-list)))
     (TeX-add-symbols
      `(,macro [ TeX-arg-eval completing-read
-                            (TeX-argument-prompt optional nil
+                            (TeX-argument-prompt t nil
                                                  ,(concat "Input separator "
                                                          "(default "
                                                          (if (and sep (not 
(string= sep "")))
@@ -197,19 +197,19 @@ macro.  If RENEW is non-nil, query for an already defined 
macro."
       ;; \keys      [<separator>]{keystrokes}
       '("menu"
        [ TeX-arg-eval completing-read
-                      (TeX-argument-prompt optional nil "Input separator")
+                      (TeX-argument-prompt t nil "Input separator")
                       LaTeX-menukeys-input-separators-list ]
        t)
 
       '("directory"
        [ TeX-arg-eval completing-read
-                      (TeX-argument-prompt optional nil "Input separator")
+                      (TeX-argument-prompt t nil "Input separator")
                       LaTeX-menukeys-input-separators-list ]
        t)
 
       '("keys"
        [ TeX-arg-eval completing-read
-                      (TeX-argument-prompt optional nil "Input separator")
+                      (TeX-argument-prompt t nil "Input separator")
                       LaTeX-menukeys-input-separators-list ]
        t)))
 
@@ -218,10 +218,10 @@ macro.  If RENEW is non-nil, query for an already defined 
macro."
     ;; \drawtikzfolder[<front fill>][<draw>]
     '("drawtikzfolder"
       [ TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Front color")
+                    (TeX-argument-prompt t nil "Front color")
                     (LaTeX-xcolor-definecolor-list) ]
       [ TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Line color")
+                    (TeX-argument-prompt t nil "Line color")
                     (LaTeX-xcolor-definecolor-list) ] )
 
     ;; 4.2.2 Declaring styles
@@ -230,24 +230,24 @@ macro.  If RENEW is non-nil, query for an already defined 
macro."
       (TeX-arg-eval
        (lambda ()
         (let ((name (TeX-read-string
-                     (TeX-argument-prompt optional nil "Name"))))
+                     (TeX-argument-prompt nil nil "Name"))))
           (LaTeX-add-menukeys-newmenustyles name)
           (format "%s" name))))
       [ t ] nil [ nil ] [ nil ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Color theme")
+                   (TeX-argument-prompt nil nil "Color theme")
                    (LaTeX-menukeys-newmenucolortheme-list)))
 
     '("newmenustylesimple*"
       (TeX-arg-eval
        (lambda ()
         (let ((name (TeX-read-string
-                     (TeX-argument-prompt optional nil "Name"))))
+                     (TeX-argument-prompt nil nil "Name"))))
           (LaTeX-add-menukeys-newmenustyles name)
           (format "%s" name))))
       [ t ] nil [ nil ] [ nil ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Color theme")
+                   (TeX-argument-prompt nil nil "Color theme")
                    (LaTeX-menukeys-newmenucolortheme-list)))
 
     ;; 
\newmenustyle*{<name>}[<pre>]{<first>}[<sep>]{<mid>}{<last>}{<single>}[<post>]{<theme>}
@@ -255,24 +255,24 @@ macro.  If RENEW is non-nil, query for an already defined 
macro."
       (TeX-arg-eval
        (lambda ()
         (let ((name (TeX-read-string
-                     (TeX-argument-prompt optional nil "Name"))))
+                     (TeX-argument-prompt nil nil "Name"))))
           (LaTeX-add-menukeys-newmenustyles name)
           (format "%s" name))))
       [ t ] nil [ nil ] nil nil nil [ nil ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Color theme")
+                   (TeX-argument-prompt nil nil "Color theme")
                    (LaTeX-menukeys-newmenucolortheme-list)))
 
     '("newmenustyle*"
       (TeX-arg-eval
        (lambda ()
         (let ((name (TeX-read-string
-                     (TeX-argument-prompt optional nil "Name"))))
+                     (TeX-argument-prompt nil nil "Name"))))
           (LaTeX-add-menukeys-newmenustyles name)
           (format "%s" name))))
       [ t ] nil [ nil ] nil nil nil [ nil ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Color theme")
+                   (TeX-argument-prompt nil nil "Color theme")
                    (LaTeX-menukeys-newmenucolortheme-list)))
 
     '("CurrentMenuElement" 0)
@@ -282,70 +282,70 @@ macro.  If RENEW is non-nil, query for an already defined 
macro."
       (TeX-arg-eval
        (lambda ()
         (let ((copy (TeX-read-string
-                     (TeX-argument-prompt optional nil "Copy")))
+                     (TeX-argument-prompt nil nil "Copy")))
               (orig (completing-read
-                     (TeX-argument-prompt optional nil "Original")
+                     (TeX-argument-prompt nil nil "Original")
                      (LaTeX-menukeys-newmenustyle-list))))
           (LaTeX-add-menukeys-newmenustyles copy)
-          (TeX-argument-insert copy optional)
+          (TeX-argument-insert copy nil)
           (format "%s" orig)))))
 
     ;; 4.2.4 Changing styles
     ;; \changemenuelement*{name}{element}{definition}
     '("changemenuelement"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Name")
+                   (TeX-argument-prompt nil nil "Name")
                    (LaTeX-menukeys-newmenustyle-list))
       2)
 
     '("changemenuelement*"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Name")
+                   (TeX-argument-prompt nil nil "Name")
                    (LaTeX-menukeys-newmenustyle-list))
       2)
 
     ;; Same arguments as \newmenustylesimple
     '("renewmenustylesimple"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Name")
+                   (TeX-argument-prompt nil nil "Name")
                    (LaTeX-menukeys-newmenustyle-list))
       [ t ] nil [ nil ] [ nil ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Color theme")
+                   (TeX-argument-prompt nil nil "Color theme")
                    (LaTeX-menukeys-newmenucolortheme-list)))
 
     '("providemenustylesimple"
       (TeX-arg-eval
        (lambda ()
         (let ((name (TeX-read-string
-                     (TeX-argument-prompt optional nil "Name"))))
+                     (TeX-argument-prompt nil nil "Name"))))
           (LaTeX-add-menukeys-newmenustyles name)
           (format "%s" name))))
       [ t ] nil [ nil ] [ nil ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Color theme")
+                   (TeX-argument-prompt nil nil "Color theme")
                    (LaTeX-menukeys-newmenucolortheme-list)))
 
     ;; Same arguments as \newmenustyle
     '("providemenustyle"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Name")
+                   (TeX-argument-prompt nil nil "Name")
                    (LaTeX-menukeys-newmenustyle-list))
       [ t ] nil [ nil ] nil nil nil [ nil ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Color theme")
+                   (TeX-argument-prompt nil nil "Color theme")
                    (LaTeX-menukeys-newmenucolortheme-list)))
 
     '("renewmenustyle"
       (TeX-arg-eval
        (lambda ()
         (let ((name (TeX-read-string
-                     (TeX-argument-prompt optional nil "Name"))))
+                     (TeX-argument-prompt nil nil "Name"))))
           (LaTeX-add-menukeys-newmenustyles name)
           (format "%s" name))))
       [ t ] nil [ nil ] nil nil nil [ nil ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Color theme")
+                   (TeX-argument-prompt nil nil "Color theme")
                    (LaTeX-menukeys-newmenucolortheme-list)))
 
     ;; 4.3 Color themes
@@ -355,36 +355,36 @@ macro.  If RENEW is non-nil, query for an already defined 
macro."
       (TeX-arg-eval
        (lambda ()
         (let ((name (TeX-read-string
-                     (TeX-argument-prompt optional nil "Name"))))
+                     (TeX-argument-prompt nil nil "Name"))))
           (LaTeX-add-menukeys-newmenucolorthemes name)
           (format "%s" name))))
       (TeX-arg-eval
        (lambda ()
         (let ((model (completing-read
-                      (TeX-argument-prompt optional nil "Model")
+                      (TeX-argument-prompt nil nil "Model")
                       (LaTeX-xcolor-color-models))))
-          (TeX-argument-insert model optional)
+          (TeX-argument-insert model nil)
           (if (string= model "named")
               (let ((bg (completing-read
-                         (TeX-argument-prompt optional nil "Node background 
color")
+                         (TeX-argument-prompt nil nil "Node background color")
                          (LaTeX-xcolor-definecolor-list)))
                     (br (completing-read
-                         (TeX-argument-prompt optional nil "Node border color")
+                         (TeX-argument-prompt nil nil "Node border color")
                          (LaTeX-xcolor-definecolor-list)))
                     (txt (completing-read
-                          (TeX-argument-prompt optional nil "Node text color")
+                          (TeX-argument-prompt nil nil "Node text color")
                           (LaTeX-xcolor-definecolor-list))))
-                (TeX-argument-insert bg optional)
-                (TeX-argument-insert br optional)
+                (TeX-argument-insert bg nil)
+                (TeX-argument-insert br nil)
                 (format "%s" txt))
             (let ((bg (TeX-read-string
-                       (TeX-argument-prompt optional nil "Node background 
color spec")))
+                       (TeX-argument-prompt nil nil "Node background color 
spec")))
                   (br (TeX-read-string
-                       (TeX-argument-prompt optional nil "Node border color 
spec")))
+                       (TeX-argument-prompt nil nil "Node border color spec")))
                   (txt (TeX-read-string
-                        (TeX-argument-prompt optional nil "Node text color 
spec"))))
-              (TeX-argument-insert bg optional)
-              (TeX-argument-insert br optional)
+                        (TeX-argument-prompt nil nil "Node text color spec"))))
+              (TeX-argument-insert bg nil)
+              (TeX-argument-insert br nil)
               (format "%s" txt))))))
       (TeX-arg-conditional (y-or-n-p "With additional optional arguments? ")
                           ( [ 3 ] )
@@ -395,35 +395,35 @@ macro.  If RENEW is non-nil, query for an already defined 
macro."
       (TeX-arg-eval
        (lambda ()
         (let ((copy (TeX-read-string
-                     (TeX-argument-prompt optional nil "Copy")))
+                     (TeX-argument-prompt nil nil "Copy")))
               (orig (completing-read
-                     (TeX-argument-prompt optional nil "Original")
+                     (TeX-argument-prompt nil nil "Original")
                      (LaTeX-menukeys-newmenucolortheme-list))))
           (LaTeX-add-menukeys-newmenucolorthemes copy)
-          (TeX-argument-insert copy optional)
+          (TeX-argument-insert copy nil)
           (format "%s" orig)))))
 
     ;; 4.3.4 Change a theme
     '("changemenucolor"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Name")
+                   (TeX-argument-prompt nil nil "Name")
                    (LaTeX-menukeys-newmenucolortheme-list))
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Element")
+                   (TeX-argument-prompt nil nil "Element")
                    '("bg" "br" "txt"))
       (TeX-arg-eval
        (lambda ()
         (let ((model (completing-read
-                      (TeX-argument-prompt optional nil "Model")
+                      (TeX-argument-prompt nil nil "Model")
                       (LaTeX-xcolor-color-models))))
-          (TeX-argument-insert model optional)
+          (TeX-argument-insert model nil)
           (if (string= model "named")
               (let ((color (completing-read
-                            (TeX-argument-prompt optional nil "Color")
+                            (TeX-argument-prompt nil nil "Color")
                             (LaTeX-xcolor-definecolor-list))))
                 (format "%s" color))
             (let ((color (TeX-read-string
-                          (TeX-argument-prompt optional nil "Color spec"))))
+                          (TeX-argument-prompt nil nil "Color spec"))))
               (format "%s" color)))))))
 
     ;; Same arguments as \newmenucolortheme
@@ -431,36 +431,36 @@ macro.  If RENEW is non-nil, query for an already defined 
macro."
       (TeX-arg-eval
        (lambda ()
         (let ((name (TeX-read-string
-                     (TeX-argument-prompt optional nil "Name"))))
+                     (TeX-argument-prompt nil nil "Name"))))
           (LaTeX-add-menukeys-newmenucolorthemes name)
           (format "%s" name))))
       (TeX-arg-eval
        (lambda ()
         (let ((model (completing-read
-                      (TeX-argument-prompt optional nil "Model")
+                      (TeX-argument-prompt nil nil "Model")
                       (LaTeX-xcolor-color-models))))
-          (TeX-argument-insert model optional)
+          (TeX-argument-insert model nil)
           (if (string= model "named")
               (let ((bg (completing-read
-                         (TeX-argument-prompt optional nil "Node background 
color")
+                         (TeX-argument-prompt nil nil "Node background color")
                          (LaTeX-xcolor-definecolor-list)))
                     (br (completing-read
-                         (TeX-argument-prompt optional nil "Node border color")
+                         (TeX-argument-prompt nil nil "Node border color")
                          (LaTeX-xcolor-definecolor-list)))
                     (txt (completing-read
-                          (TeX-argument-prompt optional nil "Node text color")
+                          (TeX-argument-prompt nil nil "Node text color")
                           (LaTeX-xcolor-definecolor-list))))
-                (TeX-argument-insert bg optional)
-                (TeX-argument-insert br optional)
+                (TeX-argument-insert bg nil)
+                (TeX-argument-insert br nil)
                 (format "%s" txt))
             (let ((bg (TeX-read-string
-                       (TeX-argument-prompt optional nil "Node background 
color spec")))
+                       (TeX-argument-prompt nil nil "Node background color 
spec")))
                   (br (TeX-read-string
-                       (TeX-argument-prompt optional nil "Node border color 
spec")))
+                       (TeX-argument-prompt nil nil "Node border color spec")))
                   (txt (TeX-read-string
-                        (TeX-argument-prompt optional nil "Node text color 
spec"))))
-              (TeX-argument-insert bg optional)
-              (TeX-argument-insert br optional)
+                        (TeX-argument-prompt nil nil "Node text color spec"))))
+              (TeX-argument-insert bg nil)
+              (TeX-argument-insert br nil)
               (format "%s" txt))))))
       (TeX-arg-conditional (y-or-n-p "With additional optional arguments? ")
                           ( [ 3 ] )
diff --git a/style/moodle.el b/style/moodle.el
index bcdfd1d..920e385 100644
--- a/style/moodle.el
+++ b/style/moodle.el
@@ -188,7 +188,7 @@
     '("moodleset"
       (TeX-arg-eval
        (lambda ()
-        (let ((opts (TeX-read-key-val optional
+        (let ((opts (TeX-read-key-val nil
                                       (append '(("ppi")) 
LaTeX-moodle-key-val-options))))
           (format "%s" opts)))))
 
diff --git a/style/natbib.el b/style/natbib.el
index f65cfe5..1574519 100644
--- a/style/natbib.el
+++ b/style/natbib.el
@@ -116,7 +116,7 @@
       "Punctuation between years for common authors")
 
     '("citestyle" (TeX-arg-eval completing-read
-                               (TeX-argument-prompt optional nil "Style")
+                               (TeX-argument-prompt nil nil "Style")
                                '("plain" "plainnat" "agu" "egu"
                                  "agms" "dcu" "kluwer" "cospar" "nature")))
 
diff --git a/style/ntheorem.el b/style/ntheorem.el
index 0e937dc..03bdf4f 100644
--- a/style/ntheorem.el
+++ b/style/ntheorem.el
@@ -223,7 +223,7 @@ make them available as new environments.  Update
 
     '("theoremnumbering"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Numbering scheme")
+                   (TeX-argument-prompt nil nil "Numbering scheme")
                    '("arabic" "roman" "Roman" "alph" "Alph"
                      "greek" "Greek" "fnsymbol")))
 
@@ -349,7 +349,7 @@ make them available as new environments.  Update
       (TeX-arg-eval
        (lambda ()
         (let ((style (TeX-read-string
-                      (TeX-argument-prompt optional nil "Style name"))))
+                      (TeX-argument-prompt nil nil "Style name"))))
           (LaTeX-add-ntheorem-newtheoremstyles style)
           (add-to-list (make-local-variable 'LaTeX-ntheorem-theoremstyle-list)
                        (list style))
@@ -366,7 +366,7 @@ make them available as new environments.  Update
       (TeX-arg-eval
        (lambda ()
         (let ((layout (TeX-read-string
-                      (TeX-argument-prompt optional nil "List layout name"))))
+                      (TeX-argument-prompt nil nil "List layout name"))))
           (LaTeX-add-ntheorem-newtheoremlisttypes layout)
           (add-to-list (make-local-variable 'LaTeX-ntheorem-listtype-list)
                        (list layout))
diff --git a/style/paracol.el b/style/paracol.el
index a0e97a0..98b2bd2 100644
--- a/style/paracol.el
+++ b/style/paracol.el
@@ -155,7 +155,7 @@ If OPTIONAL is non-nil, insert the result in square 
brackets."
     ;; 7.6 Page-Wise Footnotes
     '("footnotelayout"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Layout")
+                   (TeX-argument-prompt nil nil "Layout")
                    '("c" "m" "p")))
 
     ;; \footnote*[num]{text}
@@ -204,7 +204,7 @@ If OPTIONAL is non-nil, insert the result in square 
brackets."
     ;; \backgroundcolor{region(x0,y0)(x1,y1)}[mode]{color}
     '("backgroundcolor"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Region")
+                   (TeX-argument-prompt nil nil "Region")
                    '("c" "g" "s" "f" "n" "p" "t" "b" "l" "r"
                      "C" "G" "S" "F" "N" "P" "T" "B" "L" "R"))
       (TeX-arg-conditional (member "xcolor" (TeX-style-list))
@@ -214,7 +214,7 @@ If OPTIONAL is non-nil, insert the result in square 
brackets."
     ;; \nobackgroundcolor{region}
     '("nobackgroundcolor"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Region")
+                   (TeX-argument-prompt nil nil "Region")
                    '("c" "g" "s" "f" "n" "p" "t" "b" "l" "r"
                      "C" "G" "S" "F" "N" "P" "T" "B" "L" "R")))
 
@@ -225,7 +225,7 @@ If OPTIONAL is non-nil, insert the result in square 
brackets."
     ;; \addcontentsonly{file}{col}
     '("addcontentsonly"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Content file")
+                   (TeX-argument-prompt nil nil "Content file")
                    '("toc" "lof" "lot"))
       "Column")
 
diff --git a/style/pythontex.el b/style/pythontex.el
index 1e5ade3..ce316b6 100644
--- a/style/pythontex.el
+++ b/style/pythontex.el
@@ -294,10 +294,10 @@ a list of strings."
     ;; pythontexcustomc[<position>]{<family>}{<code>}
     '("pythontexcustomc"
       [ TeX-arg-eval completing-read
-       (TeX-argument-prompt optional nil "Position")
-       '("begin" "end") ]
+                    (TeX-argument-prompt t nil "Position")
+                    '("begin" "end") ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Family")
+                   (TeX-argument-prompt nil nil "Family")
                    LaTeX-pythontex-family-list)
       t)
 
@@ -305,33 +305,33 @@ a list of strings."
     ;; \setpythontexfv[<family>]{<fancyvrb settings>}
     '("setpythontexfv"
       [ TeX-arg-eval completing-read
-       (TeX-argument-prompt optional nil "Family")
-       LaTeX-pythontex-family-list ]
+                    (TeX-argument-prompt t nil "Family")
+                    LaTeX-pythontex-family-list ]
       (TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local))
 
     ;; \setpythontexprettyprinter[<family>]{<printer>}
     '("setpythontexprettyprinter"
       [ TeX-arg-eval completing-read
-       (TeX-argument-prompt optional nil "Family")
-       (cons "auto" LaTeX-pythontex-family-list) ]
+                    (TeX-argument-prompt t nil "Family")
+                    (cons "auto" LaTeX-pythontex-family-list) ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Printer")
+                   (TeX-argument-prompt nil nil "Printer")
                    '("text" "bw" "fancyvrb" "pygments")))
 
     ;; \setpythontexpyglexer[<family>]{<pygments lexer>}
     '("setpythontexpyglexer"
       [ TeX-arg-eval completing-read
-       (TeX-argument-prompt optional nil "Family")
-       LaTeX-pythontex-family-list ]
+                    (TeX-argument-prompt t nil "Family")
+                    LaTeX-pythontex-family-list ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Pygments lexer")
+                   (TeX-argument-prompt nil nil "Pygments lexer")
                    (LaTeX-pythontex-language-list)))
 
     ;; \setpythontexpygopt[<family>]{<pygments options>}
     '("setpythontexpygopt"
       [ TeX-arg-eval completing-read
-       (TeX-argument-prompt optional nil "Family")
-       LaTeX-pythontex-family-list ]
+                    (TeX-argument-prompt t nil "Family")
+                    LaTeX-pythontex-family-list ]
       (TeX-arg-key-val
        (("style") ("texcomments") ("mathescape"))))
 
@@ -339,22 +339,22 @@ a list of strings."
     ;; \printpythontex[<mode>][<options>]
     '("printpythontex"
       [ TeX-arg-eval completing-read
-       (TeX-argument-prompt optional nil "Mode")
-       '("raw" "verb" "verbatim") ]
+                    (TeX-argument-prompt t nil "Mode")
+                    '("raw" "verb" "verbatim") ]
       [ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ] )
 
     ;; \stdoutpythontex[<mode>][<options>]
     '("stdoutpythontex"
       [ TeX-arg-eval completing-read
-       (TeX-argument-prompt optional nil "Mode")
-       '("raw" "verb" "verbatim") ]
+                    (TeX-argument-prompt t nil "Mode")
+                    '("raw" "verb" "verbatim") ]
       [ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ] )
 
     ;;\saveprintpythontex{<name>}
     '("saveprintpythontex"
       (TeX-arg-eval (lambda ()
                      (let ((name (TeX-read-string
-                                  (TeX-argument-prompt optional nil "Name"))))
+                                  (TeX-argument-prompt nil nil "Name"))))
                        (LaTeX-add-pythontex-savecontents name)
                        (format "%s" name)))))
 
@@ -362,7 +362,7 @@ a list of strings."
     '("savestdoutpythontex"
       (TeX-arg-eval (lambda ()
                      (let ((name (TeX-read-string
-                                  (TeX-argument-prompt optional nil "Name"))))
+                                  (TeX-argument-prompt nil nil "Name"))))
                        (LaTeX-add-pythontex-savecontents name)
                        (format "%s" name)))))
 
@@ -370,29 +370,29 @@ a list of strings."
     ;; I assume <verbatim options> is meant to be <mode>
     '("useprintpythontex"
       [ TeX-arg-eval completing-read
-       (TeX-argument-prompt optional nil "Mode")
-       '("raw" "verb" "verbatim") ]
+                    (TeX-argument-prompt t nil "Mode")
+                    '("raw" "verb" "verbatim") ]
       [ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Name")
+                   (TeX-argument-prompt nil nil "Name")
                    (LaTeX-pythontex-savecontent-list)))
 
     ;; \usestdoutpythontex[<verbatim options>][<fancyvrb options>]{<name>}
     ;; I assume <verbatim options> is meant to be <mode>
     '("usestdoutpythontex"
       [ TeX-arg-eval completing-read
-       (TeX-argument-prompt optional nil "Mode")
-       '("raw" "verb" "verbatim") ]
+                    (TeX-argument-prompt t nil "Mode")
+                    '("raw" "verb" "verbatim") ]
       [ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Name")
+                   (TeX-argument-prompt nil nil "Name")
                    (LaTeX-pythontex-savecontent-list)))
 
     ;; \stderrpythontex[<mode>][<fancyvrb options>]
     '("stderrpythontex"
       [ TeX-arg-eval completing-read
-       (TeX-argument-prompt optional nil "Mode")
-       '("raw" "verb" "verbatim") ]
+                    (TeX-argument-prompt t nil "Mode")
+                    '("raw" "verb" "verbatim") ]
       [ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ] )
 
 
@@ -400,37 +400,37 @@ a list of strings."
     '("savestderrpythontex"
       (TeX-arg-eval (lambda ()
                      (let ((name (TeX-read-string
-                                  (TeX-argument-prompt optional nil "Name"))))
+                                  (TeX-argument-prompt nil nil "Name"))))
                        (LaTeX-add-pythontex-savecontents name)
                        (format "%s" name)))))
 
     ;; \usestderrpythontex[<mode>][<fancyvrb options>]{<name>}
     '("usestderrpythontex"
       [ TeX-arg-eval completing-read
-       (TeX-argument-prompt optional nil "Mode")
-       '("raw" "verb" "verbatim") ]
+                    (TeX-argument-prompt t nil "Mode")
+                    '("raw" "verb" "verbatim") ]
       [ TeX-arg-key-val LaTeX-fancyvrb-key-val-options-local ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Name")
+                   (TeX-argument-prompt nil nil "Name")
                    (LaTeX-pythontex-savecontent-list)))
 
     ;;\setpythontexautoprint{<boolean>}
     '("setpythontexautoprint"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Boolean value")
+                   (TeX-argument-prompt nil nil "Boolean value")
                    '("true" "false")))
 
     ;; \setpythontexautostdout{<boolean>}
     '("setpythontexautostdout"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Boolean value")
+                   (TeX-argument-prompt nil nil "Boolean value")
                    '("true" "false")))
 
     ;; 4.3 Pygments commands and environments
     ;; \pygment{<lexer>}<opening delim><code><closing delim>
     '("pygment"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Lexer")
+                   (TeX-argument-prompt nil nil "Lexer")
                    (LaTeX-pythontex-language-list))
       TeX-arg-verb-delim-or-brace)
 
@@ -438,29 +438,29 @@ a list of strings."
     '("inputpygments"
       [ TeX-arg-eval LaTeX-fancyvrb-key-val-options-local ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Lexer")
+                   (TeX-argument-prompt nil nil "Lexer")
                    (LaTeX-pythontex-language-list))
       TeX-arg-file-name)
 
     ;; \setpygmentsfv[<lexer>]{<fancyvrb settings>}
     '("setpygmentsfv"
       [ TeX-arg-eval completing-read
-       (TeX-argument-prompt optional nil "Lexer")
-       (LaTeX-pythontex-language-list) ]
+                    (TeX-argument-prompt t nil "Lexer")
+                    (LaTeX-pythontex-language-list) ]
       (TeX-arg-eval LaTeX-fancyvrb-key-val-options-local))
 
     ;; \setpygmentspygopt[<lexer>]{<pygments options>}
     '("setpygmentspygopt"
       [ TeX-arg-eval completing-read
-       (TeX-argument-prompt optional nil "Lexer")
-       (LaTeX-pythontex-language-list) ]
+                    (TeX-argument-prompt t nil "Lexer")
+                    (LaTeX-pythontex-language-list) ]
       (TeX-arg-key-val
        (("style") ("texcomments") ("mathescape"))))
 
     ;; \setpygmentsprettyprinter{<printer>}
     '("setpygmentsprettyprinter"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Printer")
+                   (TeX-argument-prompt nil nil "Printer")
                    '("text" "bw" "fancyvrb" "pygments")))
 
     ;; 4.5  Advanced PythonTeX usage
@@ -494,7 +494,7 @@ a list of strings."
       (TeX-arg-eval
        (lambda ()
         (let ((name (TeX-read-string
-                     (TeX-argument-prompt optional nil "Listing environment 
name"))))
+                     (TeX-argument-prompt nil nil "Listing environment 
name"))))
           (LaTeX-add-newfloat-DeclareFloatingEnvironments `(,name "verbatim"))
           (LaTeX-newfloat-auto-cleanup)
           (format "%s" name))))))
@@ -503,17 +503,17 @@ a list of strings."
     ;; 4.2.5 Custom code
     '("pythontexcustomcode" LaTeX-env-args
       [ TeX-arg-eval completing-read
-       (TeX-argument-prompt optional nil "Position")
-       '("begin" "end") ]
+                    (TeX-argument-prompt t nil "Position")
+                    '("begin" "end") ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Family")
+                   (TeX-argument-prompt nil nil "Family")
                    LaTeX-pythontex-family-list))
 
     ;; \begin{pygments}[<fancyvrb settings>]{<lexer>}
     '("pygments" LaTeX-env-args
       [ TeX-arg-eval LaTeX-fancyvrb-key-val-options-local ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Lexer")
+                   (TeX-argument-prompt nil nil "Lexer")
                    (LaTeX-pythontex-language-list))) )
 
    ;; Filling
diff --git a/style/splitidx.el b/style/splitidx.el
index ce7f6e6..f2ed53f 100644
--- a/style/splitidx.el
+++ b/style/splitidx.el
@@ -152,7 +152,7 @@
       (TeX-arg-eval
        (lambda ()
         (let ((shortcut (TeX-read-string
-                         (TeX-argument-prompt optional nil "Short cut"))))
+                         (TeX-argument-prompt nil nil "Short cut"))))
           (LaTeX-add-splitidx-newindices shortcut)
           (format "%s" shortcut)))))
 
@@ -160,20 +160,20 @@
     '("sindex"
       ;; I don't use `[ TeX-arg-index-tag ]' here
       [ TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Short cut")
+                    (TeX-argument-prompt t nil "Short cut")
                     (LaTeX-splitidx-newindex-list) ]
       TeX-arg-index)
 
     ;; 3.4 Customizing index entries
     '("AtWriteToIndex"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Short cut")
+                   (TeX-argument-prompt nil nil "Short cut")
                    (LaTeX-splitidx-newindex-list))
       t)
 
     '("AtNextWriteToIndex"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Short cut")
+                   (TeX-argument-prompt nil nil "Short cut")
                    (LaTeX-splitidx-newindex-list))
       t)
 
@@ -183,14 +183,14 @@
       (TeX-arg-eval
        (lambda ()
         (let ((shortcut (TeX-read-string
-                         (TeX-argument-prompt optional nil "Short cut"))))
+                         (TeX-argument-prompt nil nil "Short cut"))))
           (LaTeX-add-splitidx-newindices shortcut)
           (format "%s" shortcut)))))
 
     ;; 3.7 Including the generated indices in your document
     '("printindex"
       [ TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Short cut")
+                    (TeX-argument-prompt t nil "Short cut")
                     (LaTeX-splitidx-newindex-list) ]
       [ "Index name" ])
 
@@ -198,7 +198,7 @@
 
     '("printsubindex"
       [ TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Short cut")
+                    (TeX-argument-prompt t nil "Short cut")
                     (LaTeX-splitidx-newindex-list) ]
       [ "Index name" ])
 
@@ -206,7 +206,7 @@
 
     '("setindexpreamble"
       [ TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Short cut")
+                    (TeX-argument-prompt t nil "Short cut")
                     (LaTeX-splitidx-newindex-list) ]
       t)
 
@@ -246,7 +246,7 @@
        (TeX-add-symbols
        '("index"
          [TeX-arg-eval completing-read
-                       (TeX-argument-prompt optional nil "Short cut")
+                       (TeX-argument-prompt t nil "Short cut")
                        (LaTeX-splitidx-newindex-list) ]
          (TeX-arg-index)))
        ;; Tell RefTeX to look in the optional arg. for the index short cut
diff --git a/style/tcolorbox.el b/style/tcolorbox.el
index b421731..7d30683 100644
--- a/style/tcolorbox.el
+++ b/style/tcolorbox.el
@@ -586,7 +586,7 @@ e.g. \"tcolorboxlib-raster.el\"."
     '("tcbuselibrary"
       (TeX-arg-eval mapconcat #'identity
                    (TeX-completing-read-multiple
-                    (TeX-argument-prompt optional nil "Libraries")
+                    (TeX-argument-prompt nil nil "Libraries")
                     LaTeX-tcolorbox-library-list) ","))
 
     ;; 3 Macros for Box Creation
@@ -599,7 +599,7 @@ e.g. \"tcolorboxlib-raster.el\"."
       (TeX-arg-key-val LaTeX-tcolorbox-keyval-options-local))
 
     '("tcbox"
-      [ TeX-arg-eval TeX-read-key-val optional
+      [ TeX-arg-eval TeX-read-key-val t
                     (append
                      LaTeX-tcolorbox-tcbox-options
                      LaTeX-tcolorbox-keyval-options-local) ]
@@ -614,7 +614,7 @@ e.g. \"tcolorboxlib-raster.el\"."
     '("renewtcolorbox"
       [ TeX-arg-key-val LaTeX-tcolorbox-init-options ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Color box")
+                   (TeX-argument-prompt nil nil "Color box")
                    (LaTeX-tcolorbox-newtcolorbox-list))
       [ TeX-arg-define-macro-arguments ]
       (TeX-arg-key-val LaTeX-tcolorbox-keyval-options-local))
@@ -630,7 +630,7 @@ e.g. \"tcolorboxlib-raster.el\"."
       (TeX-arg-eval
        (lambda ()
         (let ((macro (completing-read
-                      (TeX-argument-prompt optional nil "Macro: \\" t)
+                      (TeX-argument-prompt nil nil "Macro: \\" t)
                       (LaTeX-tcolorbox-newtcbox-list))))
           (concat TeX-esc macro))))
       [ TeX-arg-define-macro-arguments ]
@@ -652,7 +652,7 @@ e.g. \"tcolorboxlib-raster.el\"."
     ;; 5.2 Lists of tcolorboxes
     '("tcblistof"
       [ TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Macro")
+                    (TeX-argument-prompt t nil "Macro")
                     (if (< (LaTeX-largest-level) 2)
                         '("\\chapter" "\\section" "\\subsection" 
"\\subsubsection")
                       '("\\section" "\\subsection" "\\subsubsection")) ]
diff --git a/style/tex-live.el b/style/tex-live.el
index 5371b0b..fc8d76a 100644
--- a/style/tex-live.el
+++ b/style/tex-live.el
@@ -78,7 +78,7 @@
     '("boxedverbatiminput" LaTeX-fancyvrb-arg-file-relative)
     '("listinginput"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Value of firstnumber 
key")
+                   (TeX-argument-prompt nil nil "Value of firstnumber key")
                    (cadr (assoc "firstnumber" 
LaTeX-fancyvrb-key-val-options-local)))
       LaTeX-fancyvrb-arg-file-relative)
 
@@ -91,7 +91,7 @@
     '("filename" "Directory")
     '("envname"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Environment")
+                   (TeX-argument-prompt nil nil "Environment")
                    '("TEXMFCACHE"
                      "TEXMFCNF"
                      "TEXMFCONFIG"
diff --git a/style/thmtools.el b/style/thmtools.el
index 438f3e1..334fccc 100644
--- a/style/thmtools.el
+++ b/style/thmtools.el
@@ -270,7 +270,7 @@ RefTeX users should customize or add ENVIRONMENT to
     '("ignoretheorems"
       (TeX-arg-eval mapconcat #'identity
                    (TeX-completing-read-multiple
-                    (TeX-argument-prompt optional nil "Environment(s)")
+                    (TeX-argument-prompt nil nil "Environment(s)")
                     (append
                      ;; check for \newtheorem from amsthm.sty:
                      (when (and (fboundp 'LaTeX-amsthm-newtheorem-list)
diff --git a/style/titleps.el b/style/titleps.el
index e6514f5..c53bee8 100644
--- a/style/titleps.el
+++ b/style/titleps.el
@@ -78,7 +78,7 @@ Removal is based on the return value of function
       (TeX-arg-eval
        (lambda ()
         (let ((ps (TeX-read-string
-                   (TeX-argument-prompt optional nil "Page style"))))
+                   (TeX-argument-prompt nil nil "Page style"))))
           (LaTeX-add-pagestyles ps)
           (format "%s" ps))))
       (TeX-arg-conditional (y-or-n-p "With optional global style? ")
@@ -106,14 +106,14 @@ Removal is based on the return value of function
     '("settitlemarks"
       (TeX-arg-eval mapconcat #'identity
                    (TeX-completing-read-multiple
-                    (TeX-argument-prompt optional nil "Level names")
+                    (TeX-argument-prompt nil nil "Level names")
                     (LaTeX-titleps-section-command-list))
                    ","))
 
     '("settitlemarks"
       (TeX-arg-eval mapconcat #'identity
                    (TeX-completing-read-multiple
-                    (TeX-argument-prompt optional nil "Level names")
+                    (TeX-argument-prompt nil nil "Level names")
                     (LaTeX-titleps-section-command-list))
                    ","))
 
@@ -140,12 +140,12 @@ Removal is based on the return value of function
 
     '("TitlepsPatchSection"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Sectioning command")
+                   (TeX-argument-prompt nil nil "Sectioning command")
                    (LaTeX-titleps-section-command-list)))
 
     '("TitlepsPatchSection*"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Sectioning command")
+                   (TeX-argument-prompt nil nil "Sectioning command")
                    (LaTeX-titleps-section-command-list)))
 
     ;; 5. Marks
@@ -161,13 +161,13 @@ Removal is based on the return value of function
 
     '("pretitlemark"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Sectioning command")
+                   (TeX-argument-prompt nil nil "Sectioning command")
                    (LaTeX-titleps-section-command-list))
       "Text")
 
     '("pretitlemark*"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Sectioning command")
+                   (TeX-argument-prompt nil nil "Sectioning command")
                    (LaTeX-titleps-section-command-list))
       "Text")
 
diff --git a/style/titlesec.el b/style/titlesec.el
index 1d88bf8..3e67546 100644
--- a/style/titlesec.el
+++ b/style/titlesec.el
@@ -121,7 +121,7 @@ insert the argument in brackets."
     '("titleformat"
       (LaTeX-arg-titlesec-titlespec)
       [TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Shape")
+                   (TeX-argument-prompt t nil "Shape")
                    LaTeX-titlesec-section-shape-list]
       (TeX-arg-conditional (y-or-n-p "With optional after-code? ")
                           (4 [nil])
@@ -158,7 +158,7 @@ insert the argument in brackets."
     ;; 3.4. Rules
     '("titleline"
       [TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Alignment")
+                   (TeX-argument-prompt t nil "Alignment")
                    '("l" "r" "c")]
       t)
 
@@ -171,20 +171,20 @@ insert the argument in brackets."
     ;; 3.5. Page styles
     '("assignpagestyle"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Sectioning command")
+                   (TeX-argument-prompt nil nil "Sectioning command")
                    (LaTeX-titlesec-section-command-list))
       (TeX-arg-pagestyle))
 
     ;; 3.9. Creating new levels and changing the class
     '("titleclass"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Sectioning command")
+                   (TeX-argument-prompt nil nil "Sectioning command")
                    (LaTeX-titlesec-section-command-list))
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Class")
+                   (TeX-argument-prompt nil nil "Class")
                    '("page" "top" "straight"))
       [TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Super level command")
+                   (TeX-argument-prompt t nil "Super level command")
                    (LaTeX-titlesec-section-command-list)]) )
 
    ;; 3.4. Rules: A variant of \titleline to be used only with calcwidth
@@ -192,7 +192,7 @@ insert the argument in brackets."
      (TeX-add-symbols
       '("titleline*"
        (TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Alignment")
+                     (TeX-argument-prompt nil nil "Alignment")
                      '("l" "r" "c"))
        t)))
 
diff --git a/style/titletoc.el b/style/titletoc.el
index 9151005..2962397 100644
--- a/style/titletoc.el
+++ b/style/titletoc.el
@@ -99,7 +99,7 @@ Removal is based on the return value of function
     ;;                {<label width>}{<leader width>}
     '("dottedcontents"
       (TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Sectioning command")
+                    (TeX-argument-prompt nil nil "Sectioning command")
                     (LaTeX-titletoc-section-command-list))
       [ TeX-arg-length "Left margin" ] 3)
 
@@ -108,7 +108,7 @@ Removal is based on the return value of function
     ;;               {<filler-page-format>}[<below-code>]
     '("titlecontents"
       (TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Sectioning command")
+                    (TeX-argument-prompt nil nil "Sectioning command")
                     (LaTeX-titletoc-section-command-list))
       [ TeX-arg-length "Left margin" ]
       (TeX-arg-conditional (y-or-n-p "With optional below code argument? ")
@@ -120,7 +120,7 @@ Removal is based on the return value of function
     ;;                {<filler-page-format>}[<separator>]
     '("titlecontents*"
       (TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Sectioning command")
+                    (TeX-argument-prompt nil nil "Sectioning command")
                     (LaTeX-titletoc-section-command-list))
       [ TeX-arg-length "Left margin" ]
       (TeX-arg-conditional (y-or-n-p "With optional separator argument? ")
@@ -151,11 +151,11 @@ Removal is based on the return value of function
         (let ((name (if (and (member "newfloat" (TeX-active-styles))
                              (LaTeX-newfloat-DeclareFloatingEnvironment-list))
                         (completing-read
-                         (TeX-argument-prompt optional nil "Name of contents")
+                         (TeX-argument-prompt nil nil "Name of contents")
                          (mapcar #'car
                                  
(LaTeX-newfloat-DeclareFloatingEnvironment-list)))
                       (TeX-read-string
-                       (TeX-argument-prompt optional nil "Name of 
contents")))))
+                       (TeX-argument-prompt nil nil "Name of contents")))))
           (make-local-variable 'LaTeX-titletoc-section-command-list)
           (add-to-list 'LaTeX-titletoc-section-command-list name)
           (format "%s" name))))
diff --git a/style/xcolor.el b/style/xcolor.el
index bfdda99..e56da7b 100644
--- a/style/xcolor.el
+++ b/style/xcolor.el
@@ -231,7 +231,7 @@ If NO-NAMED is non-nil, remove \"named\" and return the
 remainder."
   (if no-named
       (remove "named" LaTeX-xcolor-color-models)
-    (symbol-value 'LaTeX-xcolor-color-models)))
+    LaTeX-xcolor-color-models))
 
 ;; Needed for auto-parsing.
 (require 'tex)
@@ -418,19 +418,19 @@ xcolor package.")
     ;; \colorlet[<type>]{<name>}[<num model>]{<color>}
     '("colorlet"
       [ TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Type")
-                    LaTeX-xcolor-type-color-models ]
+       (TeX-argument-prompt t nil "Type")
+       LaTeX-xcolor-type-color-models ]
       (TeX-arg-eval
        (lambda ()
         (let ((xcolor (TeX-read-string
-                       (TeX-argument-prompt optional nil "Color"))))
+                       (TeX-argument-prompt nil nil "Color"))))
           (LaTeX-add-xcolor-definecolors xcolor)
           (format "%s" xcolor))))
       [ TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Model")
-                    (LaTeX-xcolor-color-models t) ]
+       (TeX-argument-prompt t nil "Model")
+       (LaTeX-xcolor-color-models t) ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Color")
+                   (TeX-argument-prompt nil nil "Color")
                    (LaTeX-xcolor-definecolor-list)))
 
     ;; 2.5.3 Defining sets of colors
@@ -488,30 +488,30 @@ xcolor package.")
     ;; 2.7 Color blending
     '("blendcolors"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Mix expr")
+                   (TeX-argument-prompt nil nil "Mix expr")
                    (LaTeX-xcolor-definecolor-list)))
     '("blendcolors*"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Mix expr")
+                   (TeX-argument-prompt nil nil "Mix expr")
                    (LaTeX-xcolor-definecolor-list)))
 
     ;; 2.8 Color masks and separation
     '("maskcolors"
       [ TeX-arg-eval completing-read
-                    (TeX-argument-prompt optional nil "Model")
+                    (TeX-argument-prompt t nil "Model")
                     (LaTeX-xcolor-color-models t) ]
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Color")
+                   (TeX-argument-prompt nil nil "Color")
                    (LaTeX-xcolor-definecolor-list)))
 
     ;; 2.9 Color series
     '("definecolorseries"
       "Name"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Core model")
+                   (TeX-argument-prompt nil nil "Core model")
                    LaTeX-xcolor-core-color-models)
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Method")
+                   (TeX-argument-prompt nil nil "Method")
                    '("step" "grad" "last"))
       [ t ] nil [ nil ] nil)
 
@@ -521,14 +521,14 @@ xcolor package.")
     ;; \extractcolorspec{<color>}{<cmd>}
     '("extractcolorspec"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Color")
+                   (TeX-argument-prompt nil nil "Color")
                    (LaTeX-xcolor-definecolor-list))
       (TeX-arg-define-macro "Command: \\"))
 
     ;; \extractcolorspecs{<color>}{<model-cmd>}{<color-cmd>}
     '("extractcolorspecs"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Color")
+                   (TeX-argument-prompt nil nil "Color")
                    (LaTeX-xcolor-definecolor-list))
       (TeX-arg-define-macro "Model command: \\")
       (TeX-arg-define-macro "Color command: \\"))
@@ -541,12 +541,12 @@ xcolor package.")
     ;; \convertcolorspec{<model>}{<spec>}{<target model>}{cmd>}
     '("convertcolorspec"
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Model")
+                   (TeX-argument-prompt nil nil "Model")
                    (LaTeX-xcolor-color-models))
       (TeX-arg-eval TeX-read-string
-                   (TeX-argument-prompt optional nil "Spec"))
+                   (TeX-argument-prompt nil nil "Spec"))
       (TeX-arg-eval completing-read
-                   (TeX-argument-prompt optional nil "Model")
+                   (TeX-argument-prompt nil nil "Model")
                    (LaTeX-xcolor-color-models t))
       (TeX-arg-define-macro "Macro: \\")) ) ; close TeX-add-symbols
 
@@ -565,10 +565,10 @@ xcolor package.")
                             (ignore))
        "Row"
        (TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Odd-row color")
+                     (TeX-argument-prompt nil nil "Odd-row color")
                      (LaTeX-xcolor-definecolor-list))
        (TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Even-row color")
+                     (TeX-argument-prompt nil nil "Even-row color")
                      (LaTeX-xcolor-definecolor-list)))
       '("rowcolors*"
        (TeX-arg-conditional (y-or-n-p "With optional commands? ")
@@ -576,10 +576,10 @@ xcolor package.")
                             (ignore))
        "Row"
        (TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Odd-row color")
+                     (TeX-argument-prompt nil nil "Odd-row color")
                      (LaTeX-xcolor-definecolor-list))
        (TeX-arg-eval completing-read
-                     (TeX-argument-prompt optional nil "Even-row color")
+                     (TeX-argument-prompt nil nil "Even-row color")
                      (LaTeX-xcolor-definecolor-list)))
       '("showrowcolors" 0)
       '("hiderowcolors" 0))
@@ -589,8 +589,8 @@ xcolor package.")
    (LaTeX-add-environments
     '("testcolors" LaTeX-env-args
       [ TeX-arg-eval mapconcat #'identity
-                    (TeX-completing-read-multiple
-                     (TeX-argument-prompt optional nil "Color models")
+                    (TeX-completing-read-multiple
+                     (TeX-argument-prompt t nil "Color models")
                      (LaTeX-xcolor-color-models t))
                     "," ] ))
 

commit 2b9b3a8328ae3dcd828fd3ac397229efb8590fd3
Author: Arash Esbati <arash@gnu.org>
Date:   Fri Oct 2 10:27:23 2020 +0200

    Enable lexical-binding in all style files.

diff --git a/style/Alegreya.el b/style/Alegreya.el
index 5459a01..3636221 100644
--- a/style/Alegreya.el
+++ b/style/Alegreya.el
@@ -1,6 +1,6 @@
-;;; Alegreya.el --- AUCTeX style for `Alegreya.sty' (v2015/10/22)
+;;; Alegreya.el --- AUCTeX style for `Alegreya.sty' (v2015/10/22)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/AlegreyaSans.el b/style/AlegreyaSans.el
index eeaec06..b9773e3 100644
--- a/style/AlegreyaSans.el
+++ b/style/AlegreyaSans.el
@@ -1,6 +1,6 @@
-;;; AlegreyaSans.el --- AUCTeX style for `AlegreyaSans.sty' (v2015/10/22)
+;;; AlegreyaSans.el --- AUCTeX style for `AlegreyaSans.sty' (v2015/10/22)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/AnonymousPro.el b/style/AnonymousPro.el
index c88a917..6f66178 100644
--- a/style/AnonymousPro.el
+++ b/style/AnonymousPro.el
@@ -1,6 +1,6 @@
-;;; AnonymousPro.el --- AUCTeX style for `AnonymousPro.sty' (v2.2)
+;;; AnonymousPro.el --- AUCTeX style for `AnonymousPro.sty' (v2.2)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2014, 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2019, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/CJK.el b/style/CJK.el
index c63ceb7..bef741f 100644
--- a/style/CJK.el
+++ b/style/CJK.el
@@ -1,6 +1,6 @@
-;;; CJK.el --- AUCTeX style for the CJK package.
+;;; CJK.el --- AUCTeX style for the CJK package.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2014, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@caeruleus.net>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/CJKutf8.el b/style/CJKutf8.el
index c9e16b6..a952571 100644
--- a/style/CJKutf8.el
+++ b/style/CJKutf8.el
@@ -1,6 +1,6 @@
-;;; CJKutf8.el --- AUCTeX style for the CJKutf8 package.
+;;; CJKutf8.el --- AUCTeX style for the CJKutf8 package.  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@caeruleus.net>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/FiraMono.el b/style/FiraMono.el
index febcbea..e01541f 100644
--- a/style/FiraMono.el
+++ b/style/FiraMono.el
@@ -1,6 +1,6 @@
-;;; FiraMono.el --- AUCTeX style for `FiraMono.sty' (v2016/02/13)
+;;; FiraMono.el --- AUCTeX style for `FiraMono.sty' (v2016/02/13)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/FiraSans.el b/style/FiraSans.el
index d9bb41d..076612c 100644
--- a/style/FiraSans.el
+++ b/style/FiraSans.el
@@ -1,6 +1,6 @@
-;;; FiraSans.el --- AUCTeX style for `FiraSans.sty' (v2016/11/20)
+;;; FiraSans.el --- AUCTeX style for `FiraSans.sty' (v2016/11/20)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/MinionPro.el b/style/MinionPro.el
index 11a461b..4d854a6 100644
--- a/style/MinionPro.el
+++ b/style/MinionPro.el
@@ -1,6 +1,6 @@
-;;; MinionPro.el -- AUCTeX style for MinionPro.sty
+;;; MinionPro.el -- AUCTeX style for MinionPro.sty  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2005, 2014, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2014, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mark Trettin <Mark.Trettin@gmx.de>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/MyriadPro.el b/style/MyriadPro.el
index 215aa7d..914ff7c 100644
--- a/style/MyriadPro.el
+++ b/style/MyriadPro.el
@@ -1,6 +1,6 @@
-;;; MyriadPro.el --- AUCTeX style for `MyriadPro.sty' (v0.5)
+;;; MyriadPro.el --- AUCTeX style for `MyriadPro.sty' (v0.5)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2014, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/XCharter.el b/style/XCharter.el
index 50f1ed0..9a5054a 100644
--- a/style/XCharter.el
+++ b/style/XCharter.el
@@ -1,6 +1,6 @@
-;;; XCharter.el --- AUCTeX style for `XCharter.sty' (v1.094)
+;;; XCharter.el --- AUCTeX style for `XCharter.sty' (v1.094)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2014, 2017, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2017, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/acro.el b/style/acro.el
index caa4899..c3a3256 100644
--- a/style/acro.el
+++ b/style/acro.el
@@ -1,6 +1,6 @@
-;;; acro.el --- AUCTeX style for `acro.sty' version 1.2a.
+;;; acro.el --- AUCTeX style for `acro.sty' version 1.2a.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <giordano.mose@libero.it>
diff --git a/style/acronym.el b/style/acronym.el
index 368c35e..2760468 100644
--- a/style/acronym.el
+++ b/style/acronym.el
@@ -1,6 +1,6 @@
-;;; acronym.el --- AUCTeX style for `acronym.sty' version 1.38.
+;;; acronym.el --- AUCTeX style for `acronym.sty' version 1.38.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <giordano.mose@libero.it>
diff --git a/style/afterpage.el b/style/afterpage.el
index ec0d320..fabd953 100644
--- a/style/afterpage.el
+++ b/style/afterpage.el
@@ -1,6 +1,6 @@
-;;; afterpage.el --- AUCTeX style for `afterpage.sty'
+;;; afterpage.el --- AUCTeX style for `afterpage.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2013, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/algorithm.el b/style/algorithm.el
index 8004002..9ad7f15 100644
--- a/style/algorithm.el
+++ b/style/algorithm.el
@@ -1,4 +1,4 @@
-;;; algorithm.el --- AUCTeX style for the (LaTeX) algorithm package
+;;; algorithm.el --- AUCTeX style for the (LaTeX) algorithm package  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2020 Free Software Foundation, Inc.
 
diff --git a/style/algpseudocode.el b/style/algpseudocode.el
index eaae318..4a7a146 100644
--- a/style/algpseudocode.el
+++ b/style/algpseudocode.el
@@ -1,4 +1,4 @@
-;;; algpseudocode.el --- AUCTeX style for the (LaTeX) algpseudocode package
+;;; algpseudocode.el --- AUCTeX style for the (LaTeX) algpseudocode package  
-*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2020 Free Software Foundation, Inc.
 
diff --git a/style/alltt.el b/style/alltt.el
index c7e232d..d03b811 100644
--- a/style/alltt.el
+++ b/style/alltt.el
@@ -1,4 +1,4 @@
-;;; alltt.el --- AUCTeX style for `alltt.sty'
+;;; alltt.el --- AUCTeX style for `alltt.sty'  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2004, 2005, 2014, 2016, 2018, 2020 Free Software Foundation, 
Inc.
 
diff --git a/style/alphanum.el b/style/alphanum.el
index 6bd5a5e..5a89422 100644
--- a/style/alphanum.el
+++ b/style/alphanum.el
@@ -1,6 +1,6 @@
-;;; alphanum.el --- AUCTeX style for `alphanum.sty'
+;;; alphanum.el --- AUCTeX style for `alphanum.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2004, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Frank Küster <frank@kuesterei.ch>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/amsart.el b/style/amsart.el
index 26a054c..f9c14fd 100644
--- a/style/amsart.el
+++ b/style/amsart.el
@@ -1,4 +1,4 @@
-;;; amsart.el --- Style hook for the AMS-LaTeX article document class.
+;;; amsart.el --- Style hook for the AMS-LaTeX article document class.  -*- 
lexical-binding: t; -*-
 
 ;;; Code:
 
diff --git a/style/amsbook.el b/style/amsbook.el
index 0bdbe3a..ab18958 100644
--- a/style/amsbook.el
+++ b/style/amsbook.el
@@ -1,4 +1,4 @@
-;;; amsbook.el --- Style hook for the AMS-LaTeX book document class.
+;;; amsbook.el --- Style hook for the AMS-LaTeX book document class.  -*- 
lexical-binding: t; -*-
 
 ;;; Code:
 
diff --git a/style/amsbsy.el b/style/amsbsy.el
index 3302a8b..7a939b8 100644
--- a/style/amsbsy.el
+++ b/style/amsbsy.el
@@ -1,4 +1,4 @@
-;;; amsbsy.el --- Style hook for the AMS-LaTeX amsbsy package.
+;;; amsbsy.el --- Style hook for the AMS-LaTeX amsbsy package.  -*- 
lexical-binding: t; -*-
 ;;;
 ;;; AUTHOR: Carsten Dominik <dominik@strw.leidenuniv.nl>
 
diff --git a/style/amsfonts.el b/style/amsfonts.el
index e7328ab..54417b1 100644
--- a/style/amsfonts.el
+++ b/style/amsfonts.el
@@ -1,6 +1,6 @@
-;;; amsfonts.el --- AUCTeX style for `amsfonts.sty' version 3.01
+;;; amsfonts.el --- AUCTeX style for `amsfonts.sty' version 3.01  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <mose@gnu.org>
diff --git a/style/amsmath.el b/style/amsmath.el
index ebae233..f1f7069 100644
--- a/style/amsmath.el
+++ b/style/amsmath.el
@@ -1,4 +1,4 @@
-;;; amsmath.el --- Style hook for the AMS-LaTeX amsmath package.
+;;; amsmath.el --- Style hook for the AMS-LaTeX amsmath package.  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2002, 2005-2007, 2012-2014, 2017-2020
 ;;      Free Software Foundation, Inc.
diff --git a/style/amsopn.el b/style/amsopn.el
index 85e3f17..6bce94f 100644
--- a/style/amsopn.el
+++ b/style/amsopn.el
@@ -1,6 +1,6 @@
-;;; amsopn.el --- AUCTeX style for the `amsnopn.sty' AMS-LaTeX package
+;;; amsopn.el --- AUCTeX style for the `amsnopn.sty' AMS-LaTeX package  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 1997, 2002, 2005, 2013 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2002, 2005, 2013, 2020 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@strw.leidenuniv.nl>
 ;;         Mads Jensen <mje@inducks.org>
diff --git a/style/amssymb.el b/style/amssymb.el
index c53a52f..a380f0a 100644
--- a/style/amssymb.el
+++ b/style/amssymb.el
@@ -1,6 +1,6 @@
-;;; amssymb.el --- AUCTeX style for `amssymb.sty'
+;;; amssymb.el --- AUCTeX style for `amssymb.sty'  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012 Free Software Foundation, Inc.
+;; Copyright (C) 2012, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/amstex.el b/style/amstex.el
index 97a8b70..f8a35a4 100644
--- a/style/amstex.el
+++ b/style/amstex.el
@@ -1,6 +1,6 @@
-;;; amstex.el --- AMS-LaTeX support.
+;;; amstex.el --- AMS-LaTeX support.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Keywords: tex
diff --git a/style/amstext.el b/style/amstext.el
index d0a8e87..db7c9e7 100644
--- a/style/amstext.el
+++ b/style/amstext.el
@@ -1,4 +1,4 @@
-;;; amstext.el --- Style hook for the AMS-LaTeX amstext package.
+;;; amstext.el --- Style hook for the AMS-LaTeX amstext package.  -*- 
lexical-binding: t; -*-
 ;;;
 ;;; AUTHOR: Carsten Dominik <dominik@strw.leidenuniv.nl>
 
diff --git a/style/amsthm.el b/style/amsthm.el
index d04c4c2..b99fda8 100644
--- a/style/amsthm.el
+++ b/style/amsthm.el
@@ -1,6 +1,6 @@
-;;; amsthm.el --- Style hook for the AMS-LaTeX amsthm package.
+;;; amsthm.el --- Style hook for the AMS-LaTeX amsthm package.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 1997, 2013--2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 2013--2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@strw.leidenuniv.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/arabxetex.el b/style/arabxetex.el
index 2dd9fc2..b912a81 100644
--- a/style/arabxetex.el
+++ b/style/arabxetex.el
@@ -1,6 +1,6 @@
-;;; arabxetex.el --- AUCTeX style for `arabxetex.sty' (v1.2.1)
+;;; arabxetex.el --- AUCTeX style for `arabxetex.sty' (v1.2.1)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2017, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017--2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/array.el b/style/array.el
index d6df2eb..0917686 100644
--- a/style/array.el
+++ b/style/array.el
@@ -1,6 +1,6 @@
-;;; array.el --- AUCTeX style for `array.sty'
+;;; array.el --- AUCTeX style for `array.sty'  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013, 2015, 2018, 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2013, 2015, 2018--2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/article.el b/style/article.el
index 4bfd881..4d80850 100644
--- a/style/article.el
+++ b/style/article.el
@@ -1,4 +1,4 @@
-;;; article.el - Special code for article style.
+;;; article.el - Special code for article style.  -*- lexical-binding: t; -*-
 
 ;;; Code:
 
diff --git a/style/attachfile.el b/style/attachfile.el
index a51cdf2..b54f857 100644
--- a/style/attachfile.el
+++ b/style/attachfile.el
@@ -1,6 +1,6 @@
-;;; attachfile.el --- AUCTeX style for `attachfile.sty' (v1.6)
+;;; attachfile.el --- AUCTeX style for `attachfile.sty' (v1.6)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/australian.el b/style/australian.el
index a11b2f1..e463744 100644
--- a/style/australian.el
+++ b/style/australian.el
@@ -1,6 +1,6 @@
-;;; australian.el --- AUCTeX style for the `australian' babel option.
+;;; australian.el --- AUCTeX style for the `australian' babel option.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2017, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/austrian.el b/style/austrian.el
index fce8906..4631267 100644
--- a/style/austrian.el
+++ b/style/austrian.el
@@ -1,6 +1,6 @@
-;;; austrian.el --- AUCTeX style for the `austrian' babel option.
+;;; austrian.el --- AUCTeX style for the `austrian' babel option.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@caeruleus.net>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/babel.el b/style/babel.el
index 24d6cbb..6c1cf4d 100644
--- a/style/babel.el
+++ b/style/babel.el
@@ -1,6 +1,6 @@
-;;; babel.el --- AUCTeX style for `babel.sty' version 3.31.
+;;; babel.el --- AUCTeX style for `babel.sty' version 3.31.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2005, 2007, 2013-2019 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007, 2013-2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/baskervaldx.el b/style/baskervaldx.el
index 16b4a5c..9af7575 100644
--- a/style/baskervaldx.el
+++ b/style/baskervaldx.el
@@ -1,6 +1,6 @@
-;;; baskervaldx.el --- AUCTeX style for `baskervaldx.sty' (v1.07)
+;;; baskervaldx.el --- AUCTeX style for `baskervaldx.sty' (v1.07)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2014, 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/beamer.el b/style/beamer.el
index 5323ec7..453878f 100644
--- a/style/beamer.el
+++ b/style/beamer.el
@@ -1,4 +1,4 @@
-;;; beamer.el --- AUCTeX style for the latex-beamer class
+;;; beamer.el --- AUCTeX style for the latex-beamer class  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2003-2005, 2008, 2013-2016, 2018, 2020 Free Software 
Foundation, Inc.
 
diff --git a/style/beamerarticle.el b/style/beamerarticle.el
index 3704e61..0fba136 100644
--- a/style/beamerarticle.el
+++ b/style/beamerarticle.el
@@ -1,6 +1,6 @@
-;;; beamerarticle.el --- AUCTeX style for the latex-beamerarticle class
+;;; beamerarticle.el --- AUCTeX style for the latex-beamerarticle class  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2019, 2020 Free Software Foundation, Inc.
 
 ;; Keywords: tex
 
diff --git a/style/beamerswitch.el b/style/beamerswitch.el
index 501b375..a66eaa7 100644
--- a/style/beamerswitch.el
+++ b/style/beamerswitch.el
@@ -1,6 +1,6 @@
-;;; beamerswitch.el --- AUCTeX style for the latex-beamerswitch class
+;;; beamerswitch.el --- AUCTeX style for the latex-beamerswitch class  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2019, 2020 Free Software Foundation, Inc.
 
 ;; Keywords: tex
 
diff --git a/style/biblatex.el b/style/biblatex.el
index f38fee5..ce87783 100644
--- a/style/biblatex.el
+++ b/style/biblatex.el
@@ -1,6 +1,6 @@
-;;; biblatex.el --- AUCTeX style for `biblatex.sty' version 2.8a.
+;;; biblatex.el --- AUCTeX style for `biblatex.sty' version 2.8a.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2014, 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2014, 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@caeruleus.net>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/bicaption.el b/style/bicaption.el
index f29ccce..7892b10 100644
--- a/style/bicaption.el
+++ b/style/bicaption.el
@@ -1,4 +1,4 @@
-;;; bicaption.el --- AUCTeX style for `bicaption.sty' (v1.1-158)
+;;; bicaption.el --- AUCTeX style for `bicaption.sty' (v1.1-158)  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2016--2020 Free Software Foundation, Inc.
 
diff --git a/style/bidi.el b/style/bidi.el
index 0638482..e2ad675 100644
--- a/style/bidi.el
+++ b/style/bidi.el
@@ -1,4 +1,4 @@
-;;; bidi.el --- AUCTeX style for the (XeLaTeX) bidi package
+;;; bidi.el --- AUCTeX style for the (XeLaTeX) bidi package  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2016--2020 Free Software Foundation, Inc.
 
diff --git a/style/bidibeamer.el b/style/bidibeamer.el
index 767a647..dd8a6f0 100644
--- a/style/bidibeamer.el
+++ b/style/bidibeamer.el
@@ -1,6 +1,6 @@
-;;; bidibeamer.el --- AUCTeX style for the bidibeamer class
+;;; bidibeamer.el --- AUCTeX style for the bidibeamer class  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015 Free Software Foundation
+;; Copyright (C) 2015, 2020 Free Software Foundation
 
 ;; Author: Tassilo Horn <tsdh@gnu.org>
 ;; Created: 2015-03-08
diff --git a/style/bigdelim.el b/style/bigdelim.el
index 085185b..8476885 100644
--- a/style/bigdelim.el
+++ b/style/bigdelim.el
@@ -1,6 +1,6 @@
-;;; bigdelim.el --- AUCTeX style for `bigdelim.sty'
+;;; bigdelim.el --- AUCTeX style for `bigdelim.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/bigstrut.el b/style/bigstrut.el
index 3ece300..a4ee3be 100644
--- a/style/bigstrut.el
+++ b/style/bigstrut.el
@@ -1,6 +1,6 @@
-;;; bigstrut.el --- AUCTeX style for `bigstrut.sty'
+;;; bigstrut.el --- AUCTeX style for `bigstrut.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2012, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2012, 2014, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/bm.el b/style/bm.el
index 9e7dc6d..c348d54 100644
--- a/style/bm.el
+++ b/style/bm.el
@@ -1,6 +1,6 @@
-;;; bm.el --- AUCTeX style for `bm.sty'.
+;;; bm.el --- AUCTeX style for `bm.sty'.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <giordano.mose@libero.it>
diff --git a/style/book.el b/style/book.el
index c9571cb..b75bd27 100644
--- a/style/book.el
+++ b/style/book.el
@@ -1,4 +1,4 @@
-;;; book.el - Special code for book style.
+;;; book.el - Special code for book style.  -*- lexical-binding: t; -*-
 
 ;;; Code:
 
diff --git a/style/booktabs.el b/style/booktabs.el
index f4e60db..c4fcc55 100644
--- a/style/booktabs.el
+++ b/style/booktabs.el
@@ -1,6 +1,6 @@
-;;; booktabs.el -- AUCTeX style for booktabs.sty
+;;; booktabs.el -- AUCTeX style for booktabs.sty  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2003, 2004, 2013, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2013, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author:   Ralf Angeli <angeli@iwi.uni-sb.de>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/breqn.el b/style/breqn.el
index cef8519..64857b9 100644
--- a/style/breqn.el
+++ b/style/breqn.el
@@ -1,4 +1,4 @@
-;;; breqn.el --- AUCTeX style for `breqn.sty' (v0.98j)
+;;; breqn.el --- AUCTeX style for `breqn.sty' (v0.98j)  -*- lexical-binding: 
t; -*-
 
 ;; Copyright (C) 2017--2020 Free Software Foundation, Inc.
 
diff --git a/style/bulgarian.el b/style/bulgarian.el
index 4280ab6..e4f97d7 100644
--- a/style/bulgarian.el
+++ b/style/bulgarian.el
@@ -1,6 +1,6 @@
-;;; bulgarian.el --- AUCTeX style for the `bulgarian' babel option.
+;;; bulgarian.el --- AUCTeX style for the `bulgarian' babel option.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2008, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@caeruleus.net>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/canadian.el b/style/canadian.el
index f66e86f..fa5a96f 100644
--- a/style/canadian.el
+++ b/style/canadian.el
@@ -1,6 +1,6 @@
-;;; canadian.el --- AUCTeX style for the `canadian' babel option.
+;;; canadian.el --- AUCTeX style for the `canadian' babel option.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2017, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/captcont.el b/style/captcont.el
index d19b0c9..ae528f4 100644
--- a/style/captcont.el
+++ b/style/captcont.el
@@ -1,6 +1,6 @@
-;; captcont.el --- AUCTeX style file for captcont.sty
+;; captcont.el --- AUCTeX style file for captcont.sty  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2003, 2005, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2005, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Reiner Steib <Reiner.Steib@gmx.de>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/caption.el b/style/caption.el
index a5d325b..779d76b 100644
--- a/style/caption.el
+++ b/style/caption.el
@@ -1,6 +1,6 @@
-;;; caption.el --- AUCTeX style for `caption.sty' (v3.4a)
+;;; caption.el --- AUCTeX style for `caption.sty' (v3.4a)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015--2019 Free Software Foundation, Inc.
+;; Copyright (C) 2015--2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/changelog.el b/style/changelog.el
index feaa9dd..616d418 100644
--- a/style/changelog.el
+++ b/style/changelog.el
@@ -1,6 +1,6 @@
-;;; changelog.el --- AUCTeX style for `changelog.sty' (v2.0.0)
+;;; changelog.el --- AUCTeX style for `changelog.sty' (v2.0.0)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2019, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/cleveref.el b/style/cleveref.el
index 290bc2f..2e29fce 100644
--- a/style/cleveref.el
+++ b/style/cleveref.el
@@ -1,6 +1,6 @@
-;;; cleveref.el --- AUCTeX style for `cleveref.sty' (v0.21.4)
+;;; cleveref.el --- AUCTeX style for `cleveref.sty' (v0.21.4)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2014--2019 Free Software Foundation, Inc.
+;; Copyright (C) 2014--2020 Free Software Foundation, Inc.
 
 ;; Author: Matthew Leach <matthew@mattleach.net>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/color.el b/style/color.el
index bfc91b4..47d561e 100644
--- a/style/color.el
+++ b/style/color.el
@@ -1,6 +1,6 @@
-;;; color.el --- AUCTeX style for `color.sty' (v1.1a)
+;;; color.el --- AUCTeX style for `color.sty' (v1.1a)  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2015--2019 Free Software Foundation, Inc.
+;; Copyright (C) 2015--2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/colortbl.el b/style/colortbl.el
index c878842..80843e9 100644
--- a/style/colortbl.el
+++ b/style/colortbl.el
@@ -1,6 +1,6 @@
-;;; colortbl.el --- AUCTeX style for `colortbl.sty' (v1.0a)
+;;; colortbl.el --- AUCTeX style for `colortbl.sty' (v1.0a)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/commath.el b/style/commath.el
index 71a4713..2b61e77 100644
--- a/style/commath.el
+++ b/style/commath.el
@@ -1,6 +1,6 @@
-;;; commath.el --- AUCTeX style for `commath.sty' (v0.3)
+;;; commath.el --- AUCTeX style for `commath.sty' (v0.3)  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/comment.el b/style/comment.el
index dcac6e1..af00550 100644
--- a/style/comment.el
+++ b/style/comment.el
@@ -1,4 +1,4 @@
-;;; comment.el --- AUCTeX style for `comment.sty'
+;;; comment.el --- AUCTeX style for `comment.sty'  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2007, 2018, 2020 Free Software Foundation, Inc.
 
diff --git a/style/csquotes.el b/style/csquotes.el
index 8f64627..1674945 100644
--- a/style/csquotes.el
+++ b/style/csquotes.el
@@ -1,4 +1,4 @@
-;;; csquotes.el --- AUCTeX style for `csquotes.sty' (v5.2j)
+;;; csquotes.el --- AUCTeX style for `csquotes.sty' (v5.2j)  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2004, 2005, 2006, 2014, 2018, 2020 Free Software Foundation, 
Inc.
 
diff --git a/style/currvita.el b/style/currvita.el
index 127d68e..a92fa1f 100644
--- a/style/currvita.el
+++ b/style/currvita.el
@@ -1,6 +1,6 @@
-;;; currvita.el --- AUCTeX style for `currvita.sty' (v0.9i)
+;;; currvita.el --- AUCTeX style for `currvita.sty' (v0.9i)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2016, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/czech.el b/style/czech.el
index 7d709ed..80c1e72 100644
--- a/style/czech.el
+++ b/style/czech.el
@@ -1,4 +1,4 @@
-;;; czech.el --- Setup AUCTeX for editing Czech text.
+;;; czech.el --- Setup AUCTeX for editing Czech text.  -*- lexical-binding: t; 
-*-
 
 (TeX-add-style-hook
  "czech"
diff --git a/style/danish.el b/style/danish.el
index a70772a..9cb4763 100644
--- a/style/danish.el
+++ b/style/danish.el
@@ -1,4 +1,4 @@
-;;; danish.el --- Setup AUCTeX for editing Danish text.
+;;; danish.el --- Setup AUCTeX for editing Danish text.  -*- lexical-binding: 
t; -*-
 
 ;;; Code:
 
diff --git a/style/dashundergaps.el b/style/dashundergaps.el
index 8a59f0c..f21a2f3 100644
--- a/style/dashundergaps.el
+++ b/style/dashundergaps.el
@@ -1,6 +1,6 @@
-;;; dashundergaps.el --- AUCTeX style for `dashundergaps.sty' (v2.0d)
+;;; dashundergaps.el --- AUCTeX style for `dashundergaps.sty' (v2.0d)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/dcolumn.el b/style/dcolumn.el
index 29725ac..63645d2 100644
--- a/style/dcolumn.el
+++ b/style/dcolumn.el
@@ -1,6 +1,6 @@
-;;; dcolumn.el --- AUCTeX style for `dcolumn.sty' (v1.06)
+;;; dcolumn.el --- AUCTeX style for `dcolumn.sty' (v1.06)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2016, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/dinbrief.el b/style/dinbrief.el
index 6375afd..1d6d1a1 100644
--- a/style/dinbrief.el
+++ b/style/dinbrief.el
@@ -1,4 +1,4 @@
-;;; dinbrief.el --- Special code for LaTeX-Style dinbrief.
+;;; dinbrief.el --- Special code for LaTeX-Style dinbrief.  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 1994, 2013, 2014, 2018, 2020 Free Software Foundation, Inc.
 
diff --git a/style/dk-bib.el b/style/dk-bib.el
index 9c35a16..c934ef7 100644
--- a/style/dk-bib.el
+++ b/style/dk-bib.el
@@ -1,6 +1,6 @@
-;;; dk-bib.el --- AUCTeX style for `dk-bib.sty'
+;;; dk-bib.el --- AUCTeX style for `dk-bib.sty'  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2005, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2014, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arne Jørgensen <arne@arnested.dk>
 ;; Keywords: tex
diff --git a/style/dk.el b/style/dk.el
index 01a7411..3c4aa4a 100644
--- a/style/dk.el
+++ b/style/dk.el
@@ -1,4 +1,4 @@
-;;; dk.el - Setup AUCTeX for editing Danish text.
+;;; dk.el - Setup AUCTeX for editing Danish text.  -*- lexical-binding: t; -*-
 
 ;;; Code:
 
diff --git a/style/doc.el b/style/doc.el
index b6f3060..6311890 100644
--- a/style/doc.el
+++ b/style/doc.el
@@ -1,6 +1,6 @@
-;;; doc.el --- AUCTeX style for `doc.sty'
+;;; doc.el --- AUCTeX style for `doc.sty'  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004, 2008, 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2008, 2016, 2020 Free Software Foundation, Inc.
 
 ;; Author: Frank Küster <frank@kuesterei.ch>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/dutch.el b/style/dutch.el
index c2c56a5..803ce26 100644
--- a/style/dutch.el
+++ b/style/dutch.el
@@ -1,4 +1,4 @@
-;;; dutch.el - Setup AUCTeX for editing Dutch text.
+;;; dutch.el - Setup AUCTeX for editing Dutch text.  -*- lexical-binding: t; 
-*-
 
 ;;; Code:
 
diff --git a/style/emp.el b/style/emp.el
index 79ce9f0..30a665e 100644
--- a/style/emp.el
+++ b/style/emp.el
@@ -1,6 +1,6 @@
-;;; emp.el --- AUCTeX support for emp.sty
+;;; emp.el --- AUCTeX support for emp.sty  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004, 2005, 2014  Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2014, 2020 Free Software Foundation, Inc.
 
 ;; Author: Yvon Henel aka TeXnicien de surface <Yvon.Henel@wanadoo.fr>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/empheq.el b/style/empheq.el
index 749964a..dd1bce2 100644
--- a/style/empheq.el
+++ b/style/empheq.el
@@ -1,4 +1,4 @@
-;;; empheq.el --- AUCTeX style for `empheq.sty' (v2.14)
+;;; empheq.el --- AUCTeX style for `empheq.sty' (v2.14)  -*- lexical-binding: 
t; -*-
 
 ;; Copyright (C) 2016-2020 Free Software Foundation, Inc.
 
diff --git a/style/english.el b/style/english.el
index 33e05e8..e026003 100644
--- a/style/english.el
+++ b/style/english.el
@@ -1,4 +1,4 @@
-;;; english.el --- Setup AUCTeX for editing English text.
+;;; english.el --- Setup AUCTeX for editing English text.  -*- 
lexical-binding: t; -*-
 
 ;;; Code:
 
diff --git a/style/enumitem.el b/style/enumitem.el
index 06a44d2..b47aa25 100644
--- a/style/enumitem.el
+++ b/style/enumitem.el
@@ -1,6 +1,6 @@
-;;; enumitem.el --- AUCTeX style for `enumitem.sty' (v3.6)
+;;; enumitem.el --- AUCTeX style for `enumitem.sty' (v3.6)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/environ.el b/style/environ.el
index c5255b7..f4949a8 100644
--- a/style/environ.el
+++ b/style/environ.el
@@ -1,6 +1,6 @@
-;;; environ.el --- AUCTeX style for `environ.sty' version v0.3
+;;; environ.el --- AUCTeX style for `environ.sty' version v0.3  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/epigraph.el b/style/epigraph.el
index c607f21..de8f447 100644
--- a/style/epigraph.el
+++ b/style/epigraph.el
@@ -1,6 +1,6 @@
-;;; epigraph.el --- AUCTeX style for `epigraph.sty' v1.5c
+;;; epigraph.el --- AUCTeX style for `epigraph.sty' v1.5c  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2012, 2017, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012, 2017, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/epsf.el b/style/epsf.el
index ab5b022..22b9c24 100644
--- a/style/epsf.el
+++ b/style/epsf.el
@@ -1,6 +1,6 @@
-;;; epsf.el - Support for the epsf style option.
+;;; epsf.el - Support for the epsf style option.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2014, 2020 Free Software Foundation, Inc.
 
 ;; Contributed by Marc Gemis <makke@wins.uia.ac.be>
 
diff --git a/style/erewhon.el b/style/erewhon.el
index 58b2f06..3992441 100644
--- a/style/erewhon.el
+++ b/style/erewhon.el
@@ -1,6 +1,6 @@
-;;; erewhon.el --- AUCTeX style for `erewhon.sty' (v1.04)
+;;; erewhon.el --- AUCTeX style for `erewhon.sty' (v1.04)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2014, 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/eso-pic.el b/style/eso-pic.el
index 7d56133..4ae898a 100644
--- a/style/eso-pic.el
+++ b/style/eso-pic.el
@@ -1,6 +1,6 @@
-;;; eso-pic.el --- AUCTeX style for `eso-pic.sty' (v2.0d)
+;;; eso-pic.el --- AUCTeX style for `eso-pic.sty' (v2.0d)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/everysel.el b/style/everysel.el
index 05c1432..d931425 100644
--- a/style/everysel.el
+++ b/style/everysel.el
@@ -1,6 +1,6 @@
-;;; everysel.el --- AUCTeX style for `everysel.sty'
+;;; everysel.el --- AUCTeX style for `everysel.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2012, 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2012, 2015, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Created: 2012-12-25
diff --git a/style/exercise.el b/style/exercise.el
index 5fe3092..480d063 100644
--- a/style/exercise.el
+++ b/style/exercise.el
@@ -1,6 +1,6 @@
-;;; exercise.el --- AUCTeX style for `exercise.sty'
+;;; exercise.el --- AUCTeX style for `exercise.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2020 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Richard <theonewiththeevillook@yahoo.fr>
 ;; Created: 2014-03-17
diff --git a/style/expl3.el b/style/expl3.el
index 18b1f28..5ddf196 100644
--- a/style/expl3.el
+++ b/style/expl3.el
@@ -1,4 +1,4 @@
-;;; expl3.el --- AUCTeX style for `expl3.sty'
+;;; expl3.el --- AUCTeX style for `expl3.sty'  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2015, 2017-2020 Free Software Foundation, Inc.
 
diff --git a/style/fancyhdr.el b/style/fancyhdr.el
index 46253e2..29523a7 100644
--- a/style/fancyhdr.el
+++ b/style/fancyhdr.el
@@ -1,4 +1,4 @@
-;;; fancyhdr.el --- AUCTeX style for `fancyhdr.sty'
+;;; fancyhdr.el --- AUCTeX style for `fancyhdr.sty'  -*- lexical-binding: t; 
-*-
 
 ;; Copyright (C) 2012, 2013, 2018, 2020 Free Software Foundation, Inc.
 
diff --git a/style/fancynum.el b/style/fancynum.el
index a04be76..253a07f 100644
--- a/style/fancynum.el
+++ b/style/fancynum.el
@@ -1,6 +1,6 @@
-;;; fancynum.el --- AUCTeX style for `fancynum.sty'
+;;; fancynum.el --- AUCTeX style for `fancynum.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2013, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/fancyref.el b/style/fancyref.el
index 6b9198a..9cddc65 100644
--- a/style/fancyref.el
+++ b/style/fancyref.el
@@ -1,6 +1,6 @@
-;;; fancyref.el --- AUCTeX style file with support for fancyref.sty
+;;; fancyref.el --- AUCTeX style file with support for fancyref.sty  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 1999, 2014, 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2014, 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@strw.leidenuniv.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/fancyvrb.el b/style/fancyvrb.el
index ee046b7..ec34dc2 100644
--- a/style/fancyvrb.el
+++ b/style/fancyvrb.el
@@ -1,4 +1,4 @@
-;;; fancyvrb.el --- AUCTeX style for `fancyvrb.sty' version 3.0.
+;;; fancyvrb.el --- AUCTeX style for `fancyvrb.sty' version 3.0.  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2013, 2014, 2016-2018, 2020 Free Software Foundation, Inc.
 
diff --git a/style/fbb.el b/style/fbb.el
index 62d6bd4..2a2fc63 100644
--- a/style/fbb.el
+++ b/style/fbb.el
@@ -1,6 +1,6 @@
-;;; fbb.el --- AUCTeX style for `fbb.sty' (v1.07)
+;;; fbb.el --- AUCTeX style for `fbb.sty' (v1.07)  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2014, 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014--2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/fbox.el b/style/fbox.el
index 1ff1b69..313e823 100644
--- a/style/fbox.el
+++ b/style/fbox.el
@@ -1,4 +1,4 @@
-;;; fbox.el --- AUCTeX style for `fbox.sty' (v0.04)
+;;; fbox.el --- AUCTeX style for `fbox.sty' (v0.04)  -*- lexical-binding: t; 
-*-
 
 ;; Copyright (C) 2019--2020 Free Software Foundation, Inc.
 
diff --git a/style/filecontents.el b/style/filecontents.el
index 639e1f4..e2ad513 100644
--- a/style/filecontents.el
+++ b/style/filecontents.el
@@ -1,6 +1,6 @@
-;;; filecontents.el --- AUCTeX style for `filecontents.sty'
+;;; filecontents.el --- AUCTeX style for `filecontents.sty'  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2013--2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013--2016, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/flashcards.el b/style/flashcards.el
index 4dab852..be40995 100644
--- a/style/flashcards.el
+++ b/style/flashcards.el
@@ -1,6 +1,6 @@
-;;; flashcards.el --- AUCTeX style for the flashcards class.
+;;; flashcards.el --- AUCTeX style for the flashcards class.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2007, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@caeruleus.net>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/floatrow.el b/style/floatrow.el
index 2411d67..6dfc25b 100644
--- a/style/floatrow.el
+++ b/style/floatrow.el
@@ -1,6 +1,6 @@
-;;; floatrow.el --- AUCTeX style for `floatrow.sty' (v0.3b)
+;;; floatrow.el --- AUCTeX style for `floatrow.sty' (v0.3b)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2017--2019 Free Software Foundation, Inc.
+;; Copyright (C) 2017--2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/foils.el b/style/foils.el
index 299e3af..c117cdb 100644
--- a/style/foils.el
+++ b/style/foils.el
@@ -1,6 +1,6 @@
-;;; foils.el - Special code for FoilTeX.
+;;; foils.el - Special code for FoilTeX.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 1994-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2014, 2020 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/fontaxes.el b/style/fontaxes.el
index 232dd18..ee0af5e 100644
--- a/style/fontaxes.el
+++ b/style/fontaxes.el
@@ -1,4 +1,4 @@
-;;; fontaxes.el --- AUCTeX style for `fontaxes.sty' version v1.0d
+;;; fontaxes.el --- AUCTeX style for `fontaxes.sty' version v1.0d  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2014, 2018, 2020 Free Software Foundation, Inc.
 
diff --git a/style/fontenc.el b/style/fontenc.el
index e84aa5a..b1911e1 100644
--- a/style/fontenc.el
+++ b/style/fontenc.el
@@ -1,6 +1,6 @@
-;;; fontenc.el --- AUCTeX style for `fontenc.sty' (v1.99g)
+;;; fontenc.el --- AUCTeX style for `fontenc.sty' (v1.99g)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/fontspec.el b/style/fontspec.el
index 44bc167..18c5305 100644
--- a/style/fontspec.el
+++ b/style/fontspec.el
@@ -1,4 +1,4 @@
-;;; fontspec.el --- AUCTeX style for `fontspec.sty' version 2.6a.
+;;; fontspec.el --- AUCTeX style for `fontspec.sty' version 2.6a.  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2013, 2017, 2018, 2020 Free Software Foundation, Inc.
 
diff --git a/style/footmisc.el b/style/footmisc.el
index ebe80f8..3db2c26 100644
--- a/style/footmisc.el
+++ b/style/footmisc.el
@@ -1,6 +1,6 @@
-;;; footmisc.el --- AUCTeX style for `footmisc.sty'
+;;; footmisc.el --- AUCTeX style for `footmisc.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2011, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Created: 2011-04-08
diff --git a/style/framed.el b/style/framed.el
index 91fa0a5..14b27e7 100644
--- a/style/framed.el
+++ b/style/framed.el
@@ -1,6 +1,6 @@
-;;; framed.el --- AUCTeX style for `framed.sty' (v0.96)
+;;; framed.el --- AUCTeX style for `framed.sty' (v0.96)  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2016, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/francais.el b/style/francais.el
index 1723b59..7c0a3d1 100644
--- a/style/francais.el
+++ b/style/francais.el
@@ -1,6 +1,6 @@
-;;; francais.el --- AUCTeX style for the `francais' babel option.
+;;; francais.el --- AUCTeX style for the `francais' babel option.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/french.el b/style/french.el
index 7aefe3d..1ae822e 100644
--- a/style/french.el
+++ b/style/french.el
@@ -1,6 +1,6 @@
-;;; french.el --- AUCTeX style for the `french' babel option.
+;;; french.el --- AUCTeX style for the `french' babel option.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@caeruleus.net>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/frenchb.el b/style/frenchb.el
index 71ef1f4..9848b63 100644
--- a/style/frenchb.el
+++ b/style/frenchb.el
@@ -1,6 +1,6 @@
-;;; frenchb.el --- AUCTeX style for the `frenchb' babel option.
+;;; frenchb.el --- AUCTeX style for the `frenchb' babel option.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2005 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/fvextra.el b/style/fvextra.el
index 77b7d90..0ebd7ef 100644
--- a/style/fvextra.el
+++ b/style/fvextra.el
@@ -1,6 +1,6 @@
-;;; fvextra.el --- AUCTeX style for `fvextra.sty' (v1.4)
+;;; fvextra.el --- AUCTeX style for `fvextra.sty' (v1.4)  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2017, 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2017--2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/geometry.el b/style/geometry.el
index 3022418..f726824 100644
--- a/style/geometry.el
+++ b/style/geometry.el
@@ -1,6 +1,6 @@
-;;; geometry.el --- AUCTeX style for `geometry.sty' (v5.6)
+;;; geometry.el --- AUCTeX style for `geometry.sty' (v5.6)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/german.el b/style/german.el
index 688e5bf..1ce04d2 100644
--- a/style/german.el
+++ b/style/german.el
@@ -1,4 +1,4 @@
-;;; german.el --- Setup AUCTeX for editing German text.
+;;; german.el --- Setup AUCTeX for editing German text.  -*- lexical-binding: 
t; -*-
 
 ;;; Commentary:
 ;;
diff --git a/style/gloss-italian.el b/style/gloss-italian.el
index dd3ec07..28db473 100644
--- a/style/gloss-italian.el
+++ b/style/gloss-italian.el
@@ -1,6 +1,6 @@
-;;; gloss-italian.el --- Italian support for polyglossia package.
+;;; gloss-italian.el --- Italian support for polyglossia package.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <mose@gnu.org>
diff --git a/style/graphics.el b/style/graphics.el
index b74cd4d..0e350c1 100644
--- a/style/graphics.el
+++ b/style/graphics.el
@@ -1,4 +1,4 @@
-;;; graphics.el --- Handle graphical commands in LaTeX 2e.
+;;; graphics.el --- Handle graphical commands in LaTeX 2e.  -*- 
lexical-binding: t; -*-
 
 ;;; Code:
 
diff --git a/style/graphicx.el b/style/graphicx.el
index c27cfac..732388f 100644
--- a/style/graphicx.el
+++ b/style/graphicx.el
@@ -1,6 +1,6 @@
-;;; graphicx.el --- AUCTeX style file for graphicx.sty
+;;; graphicx.el --- AUCTeX style file for graphicx.sty  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2000, 2004, 2005, 2014--2018 by Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2004, 2005, 2014--2020 by Free Software Foundation, Inc.
 
 ;; Author: Ryuichi Arafune <arafune@debian.org>
 ;; Created: 1999/3/20
diff --git a/style/harvard.el b/style/harvard.el
index 9a97e71..7c3d468 100644
--- a/style/harvard.el
+++ b/style/harvard.el
@@ -1,6 +1,6 @@
-;;; harvard.el --- Support for Harvard Citation style package for AUCTeX.
+;;; harvard.el --- Support for Harvard Citation style package for AUCTeX.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 1994, 1997, 2005, 2012, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1997, 2005, 2012, 2014, 2020 Free Software Foundation, 
Inc.
 
 ;; Author: Berwin Turlach <statba@nus.edu.sg>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/hologo.el b/style/hologo.el
index 61bcb4e..6e1b1b2 100644
--- a/style/hologo.el
+++ b/style/hologo.el
@@ -1,6 +1,6 @@
-;;; hologo.el --- AUCTeX style for `hologo.sty' (v1.10)
+;;; hologo.el --- AUCTeX style for `hologo.sty' (v1.10)  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/hyperref.el b/style/hyperref.el
index e412120..2c8a73f 100644
--- a/style/hyperref.el
+++ b/style/hyperref.el
@@ -1,4 +1,4 @@
-;;; hyperref.el --- AUCTeX style for `hyperref.sty' v6.83m
+;;; hyperref.el --- AUCTeX style for `hyperref.sty' v6.83m  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2008, 2013-2020 Free Software Foundation, Inc.
 
diff --git a/style/icelandic.el b/style/icelandic.el
index b7efd3b..054feed 100644
--- a/style/icelandic.el
+++ b/style/icelandic.el
@@ -1,6 +1,6 @@
-;;; icelandic.el --- AUCTeX style for the `icelandic' babel option.
+;;; icelandic.el --- AUCTeX style for the `icelandic' babel option.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2007, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@caeruleus.net>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/ifluatex.el b/style/ifluatex.el
index 46d59cd..67f67ee 100644
--- a/style/ifluatex.el
+++ b/style/ifluatex.el
@@ -1,4 +1,4 @@
-;;; ifluatex.el --- AUCTeX style for `ifluatex.sty' version 1.3.
+;;; ifluatex.el --- AUCTeX style for `ifluatex.sty' version 1.3.  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2014, 2016, 2018, 2020 Free Software Foundation, Inc.
 
diff --git a/style/imakeidx.el b/style/imakeidx.el
index d361cbd..7d42e43 100644
--- a/style/imakeidx.el
+++ b/style/imakeidx.el
@@ -1,6 +1,6 @@
-;;; imakeidx.el --- AUCTeX style for `imakeidx.sty'.
+;;; imakeidx.el --- AUCTeX style for `imakeidx.sty'.  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2013, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <giordano.mose@libero.it>
diff --git a/style/index.el b/style/index.el
index 66e52da..6e0289f 100644
--- a/style/index.el
+++ b/style/index.el
@@ -1,6 +1,6 @@
-;;; index.el --- AUCTeX support for indices with index.sty.
+;;; index.el --- AUCTeX support for indices with index.sty.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2020 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@strw.leidenuniv.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/inputenc.el b/style/inputenc.el
index 42a99e3..22cd527 100644
--- a/style/inputenc.el
+++ b/style/inputenc.el
@@ -1,6 +1,6 @@
-;;; inputenc.el --- AUCTeX style for `inputenc.sty'
+;;; inputenc.el --- AUCTeX style for `inputenc.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2005, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2014, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arne Jørgensen <arne@arnested.dk>
 ;; Keywords: tex
diff --git a/style/italian.el b/style/italian.el
index 8a69c65..fe4b498 100644
--- a/style/italian.el
+++ b/style/italian.el
@@ -1,6 +1,6 @@
-;;; italian.el --- Setup AUCTeX for editing Italian text.
+;;; italian.el --- Setup AUCTeX for editing Italian text.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2004, 2005, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Davide G. M. Salvetti <salve@debian.org>
 ;; Maintainer: Davide G. M. Salvetti <salve@debian.org>
diff --git a/style/j-article.el b/style/j-article.el
index 5a26de5..05e5a84 100644
--- a/style/j-article.el
+++ b/style/j-article.el
@@ -1,4 +1,4 @@
-;;; j-article.el - Special code for j-article style.
+;;; j-article.el - Special code for j-article style.  -*- lexical-binding: t; 
-*-
 
 ;;; Code:
 
diff --git a/style/j-book.el b/style/j-book.el
index 1df4bb0..cb4834f 100644
--- a/style/j-book.el
+++ b/style/j-book.el
@@ -1,4 +1,4 @@
-;;; j-book.el - Special code for j-book style.
+;;; j-book.el - Special code for j-book style.  -*- lexical-binding: t; -*-
 
 ;;; Code:
 
diff --git a/style/j-report.el b/style/j-report.el
index 07dfcb5..8e3933d 100644
--- a/style/j-report.el
+++ b/style/j-report.el
@@ -1,4 +1,4 @@
-;;; j-report.el - Special code for j-report style.
+;;; j-report.el - Special code for j-report style.  -*- lexical-binding: t; -*-
 
 ;;; Code:
 
diff --git a/style/jarticle.el b/style/jarticle.el
index f62bc02..3b61e90 100644
--- a/style/jarticle.el
+++ b/style/jarticle.el
@@ -1,4 +1,4 @@
-;;; jarticle.el - Special code for jarticle class.
+;;; jarticle.el - Special code for jarticle class.  -*- lexical-binding: t; -*-
 
 ;;; Code:
 
diff --git a/style/jbook.el b/style/jbook.el
index bdb3dad..ba15ff1 100644
--- a/style/jbook.el
+++ b/style/jbook.el
@@ -1,4 +1,4 @@
-;;; jbook.el - Special code for jbook class.
+;;; jbook.el - Special code for jbook class.  -*- lexical-binding: t; -*-
 
 ;;; Code:
 
diff --git a/style/jreport.el b/style/jreport.el
index 77aac32..ead42e0 100644
--- a/style/jreport.el
+++ b/style/jreport.el
@@ -1,4 +1,4 @@
-;;; jreport.el - Special code for jreport class.
+;;; jreport.el - Special code for jreport class.  -*- lexical-binding: t; -*-
 
 ;;; Code:
 
diff --git a/style/jsarticle.el b/style/jsarticle.el
index d951cef..3396749 100644
--- a/style/jsarticle.el
+++ b/style/jsarticle.el
@@ -1,4 +1,4 @@
-;;; jsarticle.el - Special code for jsarticle class.
+;;; jsarticle.el - Special code for jsarticle class.  -*- lexical-binding: t; 
-*-
 
 ;;; Code:
 
diff --git a/style/jsbook.el b/style/jsbook.el
index 350e8af..09038c6 100644
--- a/style/jsbook.el
+++ b/style/jsbook.el
@@ -1,4 +1,4 @@
-;;; jsbook.el - Special code for jsbook class.
+;;; jsbook.el - Special code for jsbook class.  -*- lexical-binding: t; -*-
 
 ;;; Code:
 
diff --git a/style/jsreport.el b/style/jsreport.el
index 4603647..f3e4c58 100644
--- a/style/jsreport.el
+++ b/style/jsreport.el
@@ -1,6 +1,6 @@
-;;; jsreport.el - Special code for jsreport class.
+;;; jsreport.el - Special code for jsreport class.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2017, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ikumi Keita <ikumi@ikumi.que.jp>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/jura.el b/style/jura.el
index 236f2ce..8475ddb 100644
--- a/style/jura.el
+++ b/style/jura.el
@@ -1,6 +1,6 @@
-;;; jura.el --- AUCTeX style for `jura.cls'
+;;; jura.el --- AUCTeX style for `jura.cls'  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2020 Free Software Foundation, Inc.
 
 ;; Author: Frank Küster <frank@kuesterei.ch>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/jurabib.el b/style/jurabib.el
index 077af4a..716b3cd 100644
--- a/style/jurabib.el
+++ b/style/jurabib.el
@@ -1,6 +1,6 @@
-;;; jurabib.el --- AUCTeX style for the `jurabib' package
+;;; jurabib.el --- AUCTeX style for the `jurabib' package  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2004, 2007, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2007, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/kantlipsum.el b/style/kantlipsum.el
index cdf510f..78c0540 100644
--- a/style/kantlipsum.el
+++ b/style/kantlipsum.el
@@ -1,6 +1,6 @@
-;;; kantlipsum.el --- AUCTeX style for `kantlipsum.sty'.
+;;; kantlipsum.el --- AUCTeX style for `kantlipsum.sty'.  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2013, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <giordano.mose@libero.it>
diff --git a/style/kpfonts.el b/style/kpfonts.el
index 4938416..a6598ff 100644
--- a/style/kpfonts.el
+++ b/style/kpfonts.el
@@ -1,4 +1,4 @@
-;;; kpfonts.el --- AUCTeX style for `kpfonts.sty' version 3.31.
+;;; kpfonts.el --- AUCTeX style for `kpfonts.sty' version 3.31.  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2013, 2018, 2020 Free Software Foundation, Inc.
 
diff --git a/style/latexinfo.el b/style/latexinfo.el
index bbe6e6c..2c8835a 100644
--- a/style/latexinfo.el
+++ b/style/latexinfo.el
@@ -1,6 +1,6 @@
-;;; latexinfo.el - Support for LaTeXinfo files.
+;;; latexinfo.el - Support for LaTeXinfo files.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 1993 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2020 Free Software Foundation, Inc.
 
 ;; Author: Marc Gemis <makke@wins.uia.ac.be>
 
diff --git a/style/letter.el b/style/letter.el
index e2cc8be..55ef27b 100644
--- a/style/letter.el
+++ b/style/letter.el
@@ -1,4 +1,4 @@
-;;; letter.el - Special code for letter style.
+;;; letter.el - Special code for letter style.  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 1993, 2012, 2013, 2014, 2018, 2020 Free Software Foundation, 
Inc.
 
diff --git a/style/lettrine.el b/style/lettrine.el
index 9b3c60e..5b04be3 100644
--- a/style/lettrine.el
+++ b/style/lettrine.el
@@ -1,6 +1,6 @@
-;;; lettrine.el --- AUCTeX style for `lettrine.sty' (v2.21)
+;;; lettrine.el --- AUCTeX style for `lettrine.sty' (v2.21)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2011, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/lipsum.el b/style/lipsum.el
index e198480..7715637 100644
--- a/style/lipsum.el
+++ b/style/lipsum.el
@@ -1,6 +1,6 @@
-;;; lipsum.el --- AUCTeX style for `lipsum.sty'.
+;;; lipsum.el --- AUCTeX style for `lipsum.sty'.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2013, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <giordano.mose@libero.it>
diff --git a/style/listings.el b/style/listings.el
index f4ae693..392986c 100644
--- a/style/listings.el
+++ b/style/listings.el
@@ -1,4 +1,4 @@
-;;; listings.el --- AUCTeX style for `listings.sty'
+;;; listings.el --- AUCTeX style for `listings.sty'  -*- lexical-binding: t; 
-*-
 
 ;; Copyright (C) 2004, 2005, 2009, 2013-2020 Free Software Foundation, Inc.
 
diff --git a/style/longtable.el b/style/longtable.el
index 0c6b881..77f518f 100644
--- a/style/longtable.el
+++ b/style/longtable.el
@@ -1,6 +1,6 @@
-;;; longtable.el --- AUCTeX style for `longtable.sty'.
+;;; longtable.el --- AUCTeX style for `longtable.sty'.  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2013--2018  Free Software Foundation, Inc.
+;; Copyright (C) 2013--2020  Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <mose@gnu.org>
diff --git a/style/lscape.el b/style/lscape.el
index 8079c63..301ef13 100644
--- a/style/lscape.el
+++ b/style/lscape.el
@@ -1,6 +1,6 @@
-;;; lscape.el --- AUCTeX style for `lscape.sty'
+;;; lscape.el --- AUCTeX style for `lscape.sty'  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/ltablex.el b/style/ltablex.el
index 29a21b5..268d06b 100644
--- a/style/ltablex.el
+++ b/style/ltablex.el
@@ -1,6 +1,6 @@
-;;; ltablex.el --- AUCTeX style for `ltablex.sty' (v1.1)
+;;; ltablex.el --- AUCTeX style for `ltablex.sty' (v1.1)  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/ltugboat.el b/style/ltugboat.el
index 5521487..cf73128 100644
--- a/style/ltugboat.el
+++ b/style/ltugboat.el
@@ -1,6 +1,6 @@
-;;; ltugboat.el --- AUCTeX style for `ltugboat.cls' (v2.22)
+;;; ltugboat.el --- AUCTeX style for `ltugboat.cls' (v2.22)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2019, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/ltx-base.el b/style/ltx-base.el
index 1237afb..37f8a47 100644
--- a/style/ltx-base.el
+++ b/style/ltx-base.el
@@ -1,6 +1,6 @@
-;;; ltx-base.el --- AUCTeX style for basic LaTeX commands.
+;;; ltx-base.el --- AUCTeX style for basic LaTeX commands.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2004, 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2016, 2020 Free Software Foundation, Inc.
 
 ;; Author: Frank Küster <frank@kuesterei.ch>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/ltxdoc.el b/style/ltxdoc.el
index c645a8b..c929295 100644
--- a/style/ltxdoc.el
+++ b/style/ltxdoc.el
@@ -1,6 +1,6 @@
-;;; ltxdoc.el --- AUCTeX style for `ltxdoc.cls'
+;;; ltxdoc.el --- AUCTeX style for `ltxdoc.cls'  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2020 Free Software Foundation, Inc.
 
 ;; Author: Frank Küster <frank@kuesterei.ch>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/ltxguide.el b/style/ltxguide.el
index 8145f6e..f1a58fb 100644
--- a/style/ltxguide.el
+++ b/style/ltxguide.el
@@ -1,4 +1,4 @@
-;;; ltxguide.el --- AUCTeX style for `ltxguide.cls' (2001/05/28)
+;;; ltxguide.el --- AUCTeX style for `ltxguide.cls' (2001/05/28)  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2020 Free Software Foundation, Inc.
 
diff --git a/style/ltxtable.el b/style/ltxtable.el
index 233ffeb..3aa2424 100644
--- a/style/ltxtable.el
+++ b/style/ltxtable.el
@@ -1,6 +1,6 @@
-;;; ltxtable.el --- AUCTeX style for `ltxtable.sty' (v0.2)
+;;; ltxtable.el --- AUCTeX style for `ltxtable.sty' (v0.2)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/luacode.el b/style/luacode.el
index 8632163..236fbd1 100644
--- a/style/luacode.el
+++ b/style/luacode.el
@@ -1,6 +1,6 @@
-;;; luacode.el --- AUCTeX style for `luacode.sty' version 1.2a.
+;;; luacode.el --- AUCTeX style for `luacode.sty' version 1.2a.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2013, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <giordano.mose@libero.it>
diff --git a/style/luatextra.el b/style/luatextra.el
index 4286979..0d63483 100644
--- a/style/luatextra.el
+++ b/style/luatextra.el
@@ -1,6 +1,6 @@
-;;; luatextra.el --- AUCTeX style for `luatextra.sty' version 1.0.
+;;; luatextra.el --- AUCTeX style for `luatextra.sty' version 1.0.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2020 Free Software Foundation, Inc.
 
 ;; Author: Davide G. M. Salvetti <salve@debian.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/makeidx.el b/style/makeidx.el
index b80ee47..c5b891b 100644
--- a/style/makeidx.el
+++ b/style/makeidx.el
@@ -1,6 +1,6 @@
-;;; makeidx.el --- AUCTeX support for makeidx.sty
+;;; makeidx.el --- AUCTeX support for makeidx.sty  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2020 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@strw.leidenuniv.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/marginnote.el b/style/marginnote.el
index 9d3410e..7eeb468 100644
--- a/style/marginnote.el
+++ b/style/marginnote.el
@@ -1,6 +1,6 @@
-;;; marginnote.el --- AUCTeX style for `marginnote.sty' (v1.4)
+;;; marginnote.el --- AUCTeX style for `marginnote.sty' (v1.4)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/mathtools.el b/style/mathtools.el
index 5ee9c96..7ff8be1 100644
--- a/style/mathtools.el
+++ b/style/mathtools.el
@@ -1,4 +1,4 @@
-;;; mathtools.el --- Style hook for the LaTeX package `mathtools'.
+;;; mathtools.el --- Style hook for the LaTeX package `mathtools'.  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2011-2020 Free Software Foundation, Inc.
 
diff --git a/style/mdframed.el b/style/mdframed.el
index ec5e73a..9f9c251 100644
--- a/style/mdframed.el
+++ b/style/mdframed.el
@@ -1,6 +1,6 @@
-;;; mdframed.el --- AUCTeX style for `mdframed.sty' (v1.9b)
+;;; mdframed.el --- AUCTeX style for `mdframed.sty' (v1.9b)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2016--2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/mdsymbol.el b/style/mdsymbol.el
index 6ca690b..de50572 100644
--- a/style/mdsymbol.el
+++ b/style/mdsymbol.el
@@ -1,6 +1,6 @@
-;;; mdsymbol.el --- AUCTeX style for `mdsymbol.sty' (v0.5)
+;;; mdsymbol.el --- AUCTeX style for `mdsymbol.sty' (v0.5)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/mdwlist.el b/style/mdwlist.el
index 13245a2..fa9f171 100644
--- a/style/mdwlist.el
+++ b/style/mdwlist.el
@@ -1,6 +1,6 @@
-;;; mdwlist.el --- AUCTeX style for `mdwlist.sty'
+;;; mdwlist.el --- AUCTeX style for `mdwlist.sty'  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004, 2005, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Keywords: tex
diff --git a/style/memoir.el b/style/memoir.el
index 563adbe..b1069ed 100644
--- a/style/memoir.el
+++ b/style/memoir.el
@@ -1,6 +1,6 @@
-;;; memoir.el --- AUCTeX style for `memoir.cls'
+;;; memoir.el --- AUCTeX style for `memoir.cls'  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012 Free Software Foundation, Inc.
+;; Copyright (C) 2012, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/menukeys.el b/style/menukeys.el
index 8134b7c..4260250 100644
--- a/style/menukeys.el
+++ b/style/menukeys.el
@@ -1,6 +1,6 @@
-;;; menukeys.el --- AUCTeX style for `menukeys.sty' (v1.4)
+;;; menukeys.el --- AUCTeX style for `menukeys.sty' (v1.4)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/metalogo.el b/style/metalogo.el
index a5bb1f0..9ee4533 100644
--- a/style/metalogo.el
+++ b/style/metalogo.el
@@ -1,6 +1,6 @@
-;;; metalogo.el --- AUCTeX style for `metalogo.sty' version 0.12.
+;;; metalogo.el --- AUCTeX style for `metalogo.sty' version 0.12.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2013, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <giordano.mose@libero.it>
diff --git a/style/mflogo.el b/style/mflogo.el
index 52fa44b..7faa19a 100644
--- a/style/mflogo.el
+++ b/style/mflogo.el
@@ -1,6 +1,6 @@
-;;; mflogo.el --- AUCTeX style for `mflogo.sty'
+;;; mflogo.el --- AUCTeX style for `mflogo.sty'  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012, 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2012, 2019, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/minted.el b/style/minted.el
index ad849e7..985b2c7 100644
--- a/style/minted.el
+++ b/style/minted.el
@@ -1,4 +1,4 @@
-;;; minted.el --- AUCTeX style for `minted.sty' (v2.5)
+;;; minted.el --- AUCTeX style for `minted.sty' (v2.5)  -*- lexical-binding: 
t; -*-
 
 ;; Copyright (C) 2014-2018, 2020 Free Software Foundation, Inc.
 
diff --git a/style/mn2e.el b/style/mn2e.el
index 14a449c..c85afc5 100644
--- a/style/mn2e.el
+++ b/style/mn2e.el
@@ -1,6 +1,6 @@
-;;; mn2e.el --- AUCTeX style for `mn2e.cls' version 2.2.
+;;; mn2e.el --- AUCTeX style for `mn2e.cls' version 2.2.  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <mose@gnu.org>
diff --git a/style/mnras.el b/style/mnras.el
index e3abfc1..a55ea16 100644
--- a/style/mnras.el
+++ b/style/mnras.el
@@ -1,6 +1,6 @@
-;;; mnras.el --- AUCTeX style for `mnras.cls' version 3.0.
+;;; mnras.el --- AUCTeX style for `mnras.cls' version 3.0.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <mose@gnu.org>
diff --git a/style/moodle.el b/style/moodle.el
index f13d891..bcdfd1d 100644
--- a/style/moodle.el
+++ b/style/moodle.el
@@ -1,6 +1,6 @@
-;;; moodle.el --- AUCTeX style for `moodle.sty' (v0.5)
+;;; moodle.el --- AUCTeX style for `moodle.sty' (v0.5)  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2017, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/multicol.el b/style/multicol.el
index f57f609..85e5df9 100644
--- a/style/multicol.el
+++ b/style/multicol.el
@@ -1,6 +1,6 @@
-;;; multicol.el --- AUCTeX style for `multicol.sty'
+;;; multicol.el --- AUCTeX style for `multicol.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/multido.el b/style/multido.el
index c9c3a6a..66d4390 100644
--- a/style/multido.el
+++ b/style/multido.el
@@ -1,6 +1,6 @@
-;;; multido.el --- AUCTeX style for `multido.sty'
+;;; multido.el --- AUCTeX style for `multido.sty'  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2020 Free Software Foundation, Inc.
 
 ;; Author: Holger Sparr <holger.sparr@gmx.net>
 ;; Created: 21 Jun 2007
diff --git a/style/multind.el b/style/multind.el
index 76eabfe..53d1890 100644
--- a/style/multind.el
+++ b/style/multind.el
@@ -1,6 +1,6 @@
-;;; multind.el --- AUCTeX support for multiple indices with multind.sty.
+;;; multind.el --- AUCTeX support for multiple indices with multind.sty.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2020 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@strw.leidenuniv.nl>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/multirow.el b/style/multirow.el
index 771cea4..f2b1e3d 100644
--- a/style/multirow.el
+++ b/style/multirow.el
@@ -1,6 +1,6 @@
-;;; multirow.el --- AUCTeX style for `multirow.sty'
+;;; multirow.el --- AUCTeX style for `multirow.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2011, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/multitoc.el b/style/multitoc.el
index 43fa817..2c77e76 100644
--- a/style/multitoc.el
+++ b/style/multitoc.el
@@ -1,6 +1,6 @@
-;;; multitoc.el --- AUCTeX style for `multitoc.sty' (v2.01)
+;;; multitoc.el --- AUCTeX style for `multitoc.sty' (v2.01)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2019, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/nameref.el b/style/nameref.el
index 8421b75..41254c5 100644
--- a/style/nameref.el
+++ b/style/nameref.el
@@ -1,6 +1,6 @@
-;;; nameref.el --- AUCTeX style for `nameref.sty'
+;;; nameref.el --- AUCTeX style for `nameref.sty'  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013, 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013, 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/natbib.el b/style/natbib.el
index 596c86d..f65cfe5 100644
--- a/style/natbib.el
+++ b/style/natbib.el
@@ -1,6 +1,6 @@
-;;; natbib.el --- AUCTeX style for `natbib.sty' version 8.31b
+;;; natbib.el --- AUCTeX style for `natbib.sty' version 8.31b  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 1997, 1998, 2004, 2007, 2014--2018 Free Software Foundation, 
Inc.
+;; Copyright (C) 1997, 1998, 2004, 2007, 2014--2020 Free Software Foundation, 
Inc.
 
 ;; Authors: Berwin Turlach <statba@nus.edu.sg>
 ;;          Carsten Dominik <dominik@strw.leidenuniv.nl>
diff --git a/style/naustrian.el b/style/naustrian.el
index 99a7e30..e1be39f 100644
--- a/style/naustrian.el
+++ b/style/naustrian.el
@@ -1,6 +1,6 @@
-;;; naustrian.el --- AUCTeX style for the `naustrian' babel option.
+;;; naustrian.el --- AUCTeX style for the `naustrian' babel option.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@caeruleus.net>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/newfloat.el b/style/newfloat.el
index 9f88a2d..c4a115c 100644
--- a/style/newfloat.el
+++ b/style/newfloat.el
@@ -1,6 +1,6 @@
-;;; newfloat.el --- AUCTeX style for `newfloat.sty' (v1.1-109)
+;;; newfloat.el --- AUCTeX style for `newfloat.sty' (v1.1-109)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/newpxmath.el b/style/newpxmath.el
index df0abab..2891608 100644
--- a/style/newpxmath.el
+++ b/style/newpxmath.el
@@ -1,6 +1,6 @@
-;;; newpxmath.el --- AUCTeX style for `newpxmath.sty' (v1.232)
+;;; newpxmath.el --- AUCTeX style for `newpxmath.sty' (v1.232)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/newpxtext.el b/style/newpxtext.el
index 4112be9..2dc5ec5 100644
--- a/style/newpxtext.el
+++ b/style/newpxtext.el
@@ -1,6 +1,6 @@
-;;; newpxtext.el --- AUCTeX style for `newpxtext.sty' (v1.232)
+;;; newpxtext.el --- AUCTeX style for `newpxtext.sty' (v1.232)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/newtxmath.el b/style/newtxmath.el
index 6ae898b..b72fab6 100644
--- a/style/newtxmath.el
+++ b/style/newtxmath.el
@@ -1,6 +1,6 @@
-;;; newtxmath.el --- AUCTeX style for `newtxmath.sty' (v1.321)
+;;; newtxmath.el --- AUCTeX style for `newtxmath.sty' (v1.321)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/newtxsf.el b/style/newtxsf.el
index 236a2ad..053f974 100644
--- a/style/newtxsf.el
+++ b/style/newtxsf.el
@@ -1,6 +1,6 @@
-;;; newtxsf.el --- AUCTeX style for `newtxsf.sty' (v1.0)
+;;; newtxsf.el --- AUCTeX style for `newtxsf.sty' (v1.0)  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/newtxtext.el b/style/newtxtext.el
index 5f9c14f..6011d01 100644
--- a/style/newtxtext.el
+++ b/style/newtxtext.el
@@ -1,6 +1,6 @@
-;;; newtxtext.el --- AUCTeX style for `newtxtext.sty' (v1.434)
+;;; newtxtext.el --- AUCTeX style for `newtxtext.sty' (v1.434)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2014, 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/newtxttt.el b/style/newtxttt.el
index 1cfae90..feeb9e1 100644
--- a/style/newtxttt.el
+++ b/style/newtxttt.el
@@ -1,6 +1,6 @@
-;;; newtxtt.el --- AUCTeX style for `newtxtt.sty' (v1.05)
+;;; newtxtt.el --- AUCTeX style for `newtxtt.sty' (v1.05)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2014, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/newzealand.el b/style/newzealand.el
index c24a265..bd2229d 100644
--- a/style/newzealand.el
+++ b/style/newzealand.el
@@ -1,6 +1,6 @@
-;;; newzealand.el --- AUCTeX style for the `newzealand' babel option.
+;;; newzealand.el --- AUCTeX style for the `newzealand' babel option.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2017, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/ngerman.el b/style/ngerman.el
index 814688a..8cc8a95 100644
--- a/style/ngerman.el
+++ b/style/ngerman.el
@@ -1,4 +1,4 @@
-;;; ngerman.el --- Setup AUCTeX for editing German text.
+;;; ngerman.el --- Setup AUCTeX for editing German text.  -*- lexical-binding: 
t; -*-
 
 ;;; Commentary:
 ;;
diff --git a/style/nicefrac.el b/style/nicefrac.el
index 4d68329..e156d2a 100644
--- a/style/nicefrac.el
+++ b/style/nicefrac.el
@@ -1,6 +1,6 @@
-;;; nicefrac.el --- AUCTeX style for the LaTeX package `nicefrac.sty' (v0.9b)
+;;; nicefrac.el --- AUCTeX style for the LaTeX package `nicefrac.sty' (v0.9b)  
-*- lexical-binding: t; -*-
 
-;; Copyright (C) 2004, 2005, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Christian Schlauer <cschl@arcor.de>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/nomencl.el b/style/nomencl.el
index b74405b..f035c76 100644
--- a/style/nomencl.el
+++ b/style/nomencl.el
@@ -1,6 +1,6 @@
-;;; nomencl.el --- AUCTeX style for the nomencl class.
+;;; nomencl.el --- AUCTeX style for the nomencl class.  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2007, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2018; 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@caeruleus.net>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/ntheorem.el b/style/ntheorem.el
index 19e0dbf..0e937dc 100644
--- a/style/ntheorem.el
+++ b/style/ntheorem.el
@@ -1,6 +1,6 @@
-;;; ntheorem.el --- AUCTeX style for `ntheorem.sty' (v1.33)
+;;; ntheorem.el --- AUCTeX style for `ntheorem.sty' (v1.33)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/ocg-p.el b/style/ocg-p.el
index 3ebd41e..1c4cb80 100644
--- a/style/ocg-p.el
+++ b/style/ocg-p.el
@@ -1,6 +1,6 @@
-;;; ocg-p.el --- AUCTeX style for `ocg-p.sty' (v0.4)
+;;; ocg-p.el --- AUCTeX style for `ocg-p.sty' (v0.4)  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/ocgx.el b/style/ocgx.el
index 0e8d5c3..a65e2c5 100644
--- a/style/ocgx.el
+++ b/style/ocgx.el
@@ -1,6 +1,6 @@
-;;; ocgx.el --- AUCTeX style for `ocgx.sty' (v0.5)
+;;; ocgx.el --- AUCTeX style for `ocgx.sty' (v0.5)  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/overpic.el b/style/overpic.el
index b44e8d1..dc75845 100644
--- a/style/overpic.el
+++ b/style/overpic.el
@@ -1,4 +1,4 @@
-;;; overpic.el --- AUCTeX style for `overpic.sty' (v1.3)
+;;; overpic.el --- AUCTeX style for `overpic.sty' (v1.3)  -*- lexical-binding: 
t; -*-
 
 ;; Copyright (C) 2020 Free Software Foundation, Inc.
 
diff --git a/style/paracol.el b/style/paracol.el
index 3eef88a..a0e97a0 100644
--- a/style/paracol.el
+++ b/style/paracol.el
@@ -1,6 +1,6 @@
-;;; paracol.el --- AUCTeX style for `paracol.sty' (v1.35)
+;;; paracol.el --- AUCTeX style for `paracol.sty' (v1.35)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2016--2019 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/paralist.el b/style/paralist.el
index d25a9a6..479d352 100644
--- a/style/paralist.el
+++ b/style/paralist.el
@@ -1,6 +1,6 @@
-;;; paralist.el -- AUCTeX style for paralist.sty
+;;; paralist.el -- AUCTeX style for paralist.sty  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2003-2005, 2014, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2005, 2014, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author:   Ralf Angeli <angeli@iwi.uni-sb.de>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/pdflscape.el b/style/pdflscape.el
index 1cf6e1f..26e296d 100644
--- a/style/pdflscape.el
+++ b/style/pdflscape.el
@@ -1,6 +1,6 @@
-;;; pdflscape.el --- AUCTeX style for `pdflscape.sty' (v0.11)
+;;; pdflscape.el --- AUCTeX style for `pdflscape.sty' (v0.11)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2016, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/pdfpages.el b/style/pdfpages.el
index f32441b..9f109ed 100644
--- a/style/pdfpages.el
+++ b/style/pdfpages.el
@@ -1,6 +1,6 @@
-;;; pdfpages.el --- AUCTeX style for `pdfpages.sty' (v0.4v)
+;;; pdfpages.el --- AUCTeX style for `pdfpages.sty' (v0.4v)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/pdfsync.el b/style/pdfsync.el
index fd64421..4bf889a 100644
--- a/style/pdfsync.el
+++ b/style/pdfsync.el
@@ -1,6 +1,6 @@
-;;; pdfsync.el --- AUCTeX style for `pdfsync.sty'
+;;; pdfsync.el --- AUCTeX style for `pdfsync.sty'  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2005, 2008, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2008, 2014, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/placeins.el b/style/placeins.el
index cb4fb33..6f0a5aa 100644
--- a/style/placeins.el
+++ b/style/placeins.el
@@ -1,6 +1,6 @@
-;;; placeins.el --- AUCTeX style for `placeins.sty'
+;;; placeins.el --- AUCTeX style for `placeins.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2013, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/plext.el b/style/plext.el
index 30765a7..2824db2 100644
--- a/style/plext.el
+++ b/style/plext.el
@@ -1,6 +1,6 @@
-;;; plext.el --- AUCTeX style for the plext package.
+;;; plext.el --- AUCTeX style for the plext package.  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ikumi Keita <ikumi@ikumi.que.jp>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/plfonts.el b/style/plfonts.el
index 9df8739..c959efd 100644
--- a/style/plfonts.el
+++ b/style/plfonts.el
@@ -1,4 +1,4 @@
-;;; plfonts.el - Setup AUC TeX for editing Polish text with plfonts.sty
+;;; plfonts.el - Setup AUC TeX for editing Polish text with plfonts.sty  -*- 
lexical-binding: t; -*-
 
 ;;; Commentary:
 ;;
diff --git a/style/plhb.el b/style/plhb.el
index 0705550..8601542 100644
--- a/style/plhb.el
+++ b/style/plhb.el
@@ -1,4 +1,4 @@
-;;; plhb.el - Setup AUC TeX for editing Polish text with plhb.sty
+;;; plhb.el - Setup AUC TeX for editing Polish text with plhb.sty  -*- 
lexical-binding: t; -*-
 
 ;;; Commentary:
 ;;
diff --git a/style/polish.el b/style/polish.el
index 31397f0..71e2895 100644
--- a/style/polish.el
+++ b/style/polish.el
@@ -1,6 +1,6 @@
-;;; polish.el --- AUCTeX style for the `polish' babel option.
+;;; polish.el --- AUCTeX style for the `polish' babel option.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@caeruleus.net>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/polski.el b/style/polski.el
index 249d48c..6d5837c 100644
--- a/style/polski.el
+++ b/style/polski.el
@@ -1,6 +1,6 @@
-;;; polski.el --- AUCTeX style for `polski.sty'.
+;;; polski.el --- AUCTeX style for `polski.sty'.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2007, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@caeruleus.net>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/polyglossia.el b/style/polyglossia.el
index aaa688d..698fa60 100644
--- a/style/polyglossia.el
+++ b/style/polyglossia.el
@@ -1,6 +1,6 @@
-;;; polyglossia.el --- AUCTeX style for `polyglossia.sty' version 1.42.0.
+;;; polyglossia.el --- AUCTeX style for `polyglossia.sty' version 1.42.0.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <mose@gnu.org>
diff --git a/style/preview.el b/style/preview.el
index 5093f57..154e37a 100644
--- a/style/preview.el
+++ b/style/preview.el
@@ -1,6 +1,6 @@
-;;; preview.el --- AUCTeX style for `preview.sty' (v2010/02/14)
+;;; preview.el --- AUCTeX style for `preview.sty' (v2010/02/14)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2017, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/prosper.el b/style/prosper.el
index cfc9797..451cead 100644
--- a/style/prosper.el
+++ b/style/prosper.el
@@ -1,4 +1,4 @@
-;;; prosper.el --- Prosper style file for AUCTeX
+;;; prosper.el --- Prosper style file for AUCTeX  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2001, 2002, 2014, 2020 Free Software Foundation, Inc.
 
diff --git a/style/psfig.el b/style/psfig.el
index b0b6b94..66f1d48 100644
--- a/style/psfig.el
+++ b/style/psfig.el
@@ -1,6 +1,6 @@
-;;; psfig.el - Support for the psfig style option.
+;;; psfig.el - Support for the psfig style option.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2014, 2020 Free Software Foundation, Inc.
 
 ;; Contributed by Marc Gemis <makke@wins.uia.ac.be>
 ;; Please direct comments to him.
diff --git a/style/pst-grad.el b/style/pst-grad.el
index 829e190..319685e 100644
--- a/style/pst-grad.el
+++ b/style/pst-grad.el
@@ -1,6 +1,6 @@
-;;; pst-grad.el --- AUCTeX style for `pst-grad.sty'
+;;; pst-grad.el --- AUCTeX style for `pst-grad.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2020 Free Software Foundation, Inc.
 
 ;; Author: Holger Sparr <holger.sparr@gmx.net>
 ;; Created: 21 Jun 2007
diff --git a/style/pst-node.el b/style/pst-node.el
index 7b174cd..9956da0 100644
--- a/style/pst-node.el
+++ b/style/pst-node.el
@@ -1,6 +1,6 @@
-;;; pst-node.el --- AUCTeX style for `pst-node.sty'
+;;; pst-node.el --- AUCTeX style for `pst-node.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2007, 2013, 2014 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2013, 2014, 2020 Free Software Foundation, Inc.
 
 ;; Author: Holger Sparr <holger.sparr@gmx.net>
 ;; Created: 21 Jun 2007
diff --git a/style/pst-plot.el b/style/pst-plot.el
index 0942c6e..d8cd003 100644
--- a/style/pst-plot.el
+++ b/style/pst-plot.el
@@ -1,6 +1,6 @@
-;;; pst-plot.el --- AUCTeX style for `pst-plot.sty'
+;;; pst-plot.el --- AUCTeX style for `pst-plot.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2007, 2014, 2015, 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2014, 2015, 2019, 2020 Free Software Foundation, Inc.
 
 ;; Author: Holger Sparr <holger.sparr@gmx.net>
 ;; Created: 21 Jun 2007
diff --git a/style/pst-slpe.el b/style/pst-slpe.el
index 6efed09..e3664d2 100644
--- a/style/pst-slpe.el
+++ b/style/pst-slpe.el
@@ -1,6 +1,6 @@
-;;; pst-slpe.el --- AUCTeX style for `pst-slpe.sty'
+;;; pst-slpe.el --- AUCTeX style for `pst-slpe.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2007 Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2020 Free Software Foundation, Inc.
 
 ;; Author: Holger Sparr <holger.sparr@gmx.net>
 ;; Created: 21 Jun 2007
diff --git a/style/pstricks.el b/style/pstricks.el
index 1a24767..a904639 100644
--- a/style/pstricks.el
+++ b/style/pstricks.el
@@ -1,4 +1,4 @@
-;;; pstricks.el --- AUCTeX style for the `pstricks' package.
+;;; pstricks.el --- AUCTeX style for the `pstricks' package.  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2007, 2009, 2013-2015, 2018, 2020
 ;;                Free Software Foundation, Inc.
diff --git a/style/pythontex.el b/style/pythontex.el
index 206c32d..1e5ade3 100644
--- a/style/pythontex.el
+++ b/style/pythontex.el
@@ -1,4 +1,4 @@
-;;; pythontex.el --- AUCTeX style for `pythontex.sty' (v0.16)
+;;; pythontex.el --- AUCTeX style for `pythontex.sty' (v0.16)  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2018, 2020 Free Software Foundation, Inc.
 
diff --git a/style/ragged2e.el b/style/ragged2e.el
index 3f8932b..1148c11 100644
--- a/style/ragged2e.el
+++ b/style/ragged2e.el
@@ -1,6 +1,6 @@
-;;; ragged2e.el --- AUCTeX style for `ragged2e.sty'
+;;; ragged2e.el --- AUCTeX style for `ragged2e.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2011, 2015, 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2015, 2019, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Created: 2011-04-16
diff --git a/style/relsize.el b/style/relsize.el
index 131a152..b49d23f 100644
--- a/style/relsize.el
+++ b/style/relsize.el
@@ -1,6 +1,6 @@
-;;; relsize.el --- AUCTeX style for `relsize.sty' version v4.1
+;;; relsize.el --- AUCTeX style for `relsize.sty' version v4.1  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2014, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/report.el b/style/report.el
index 7fa96b2..deae60c 100644
--- a/style/report.el
+++ b/style/report.el
@@ -1,4 +1,4 @@
-;;; report.el - Special code for report style.
+;;; report.el - Special code for report style.  -*- lexical-binding: t; -*-
 
 ;;; Code:
 
diff --git a/style/revtex4-2.el b/style/revtex4-2.el
index dd516b1..bf3e003 100644
--- a/style/revtex4-2.el
+++ b/style/revtex4-2.el
@@ -1,4 +1,4 @@
-;;; revtex4-2.el --- AUCTeX style for `revtex4-2.cls' (v4.2c)
+;;; revtex4-2.el --- AUCTeX style for `revtex4-2.cls' (v4.2c)  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2020 Free Software Foundation, Inc.
 
diff --git a/style/ruby.el b/style/ruby.el
index 38451f9..b625efe 100644
--- a/style/ruby.el
+++ b/style/ruby.el
@@ -1,6 +1,6 @@
-;;; ruby.el --- AUCTeX style for the ruby package.
+;;; ruby.el --- AUCTeX style for the ruby package.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2009 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@caeruleus.net>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/scrartcl.el b/style/scrartcl.el
index 101ce1c..96d4044 100644
--- a/style/scrartcl.el
+++ b/style/scrartcl.el
@@ -1,7 +1,6 @@
-;;; -*- emacs-lisp -*-
-;;; scrartcl.el -- AUCTeX style for scrartcl.cls
+;;; scrartcl.el -- AUCTeX style for scrartcl.cls  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2002, 2005 Free Software Foundation
+;; Copyright (C) 2002, 2005, 2020 Free Software Foundation
 ;; License: GPL, see the file COPYING in the base directory of AUCTeX
 
 ;; Author: Mark Trettin <Mark.Trettin@gmx.de>
@@ -16,12 +15,13 @@
 ;; This file is part of  AUCTeX.
 
 ;;; Code:
-(TeX-add-style-hook "scrartcl"
-   (lambda ()
-     (LaTeX-largest-level-set "section")
-     ;; load basic definitons
-     (TeX-run-style-hooks "scrbase")
-     (LaTeX-add-environments "abstract"))
-   LaTeX-dialect)
+(TeX-add-style-hook
+ "scrartcl"
+ (lambda ()
+   (LaTeX-largest-level-set "section")
+   ;; load basic definitons
+   (TeX-run-style-hooks "scrbase")
+   (LaTeX-add-environments "abstract"))
+ LaTeX-dialect)
 
 ;;; scrartcl.el ends here
diff --git a/style/scrbase.el b/style/scrbase.el
index e55d2bb..b8da190 100644
--- a/style/scrbase.el
+++ b/style/scrbase.el
@@ -1,6 +1,6 @@
-;;; scrbase.el --- AUCTeX style for the KOMA-Script bundle.
+;;; scrbase.el --- AUCTeX style for the KOMA-Script bundle.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2002, 2004, 2005, 2007, 2014, 2018 Free Software Foundation, 
Inc.
+;; Copyright (C) 2002, 2004, 2005, 2007, 2014, 2018, 2020 Free Software 
Foundation, Inc.
 
 ;; Author: Mark Trettin <Mark.Trettin@gmx.de>
 ;; Created: 2002-09-26
diff --git a/style/scrbook.el b/style/scrbook.el
index 2e10cf0..81e43f9 100644
--- a/style/scrbook.el
+++ b/style/scrbook.el
@@ -1,6 +1,6 @@
-;;; scrbook.el --- AUCTeX style for scrbook.cls
+;;; scrbook.el --- AUCTeX style for scrbook.cls  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2002, 2005, 2018 Free Software Foundation
+;; Copyright (C) 2002, 2005, 2018, 2020 Free Software Foundation
 
 ;; Author: Mark Trettin <Mark.Trettin@gmx.de>
 ;; Created: 2002-09-26
diff --git a/style/scrlttr2.el b/style/scrlttr2.el
index 28e3ea9..85bf0ae 100644
--- a/style/scrlttr2.el
+++ b/style/scrlttr2.el
@@ -1,6 +1,6 @@
-;;; scrlttr2.el --- AUCTeX style for scrlttr2.cls.
+;;; scrlttr2.el --- AUCTeX style for scrlttr2.cls.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2002, 2007, 2014, 2018 Free Software Foundation
+;; Copyright (C) 2002, 2007, 2014, 2018, 2020 Free Software Foundation
 
 ;; Author: Mark Trettin <Mark.Trettin@gmx.de>
 ;; Created: 2002-10-26
diff --git a/style/scrpage2.el b/style/scrpage2.el
index 841a8c9..3043d79 100644
--- a/style/scrpage2.el
+++ b/style/scrpage2.el
@@ -1,4 +1,4 @@
-;;; scrpage2.el --- AUCTeX style for scrpage2.sty.
+;;; scrpage2.el --- AUCTeX style for scrpage2.sty.  -*- lexical-binding: t; -*-
 
 ;; Author:   Ralf Angeli <angeli@iwi.uni-sb.de>
 ;; Created:  2003-11-01
diff --git a/style/scrreprt.el b/style/scrreprt.el
index 2507960..ec7755b 100644
--- a/style/scrreprt.el
+++ b/style/scrreprt.el
@@ -1,6 +1,6 @@
-;;; scrreprt.el --- AUCTeX style for scrreprt.cls.
+;;; scrreprt.el --- AUCTeX style for scrreprt.cls.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2002, 2005, 2018 Free Software Foundation
+;; Copyright (C) 2002, 2005, 2018, 2020 Free Software Foundation
 
 ;; Author: Mark Trettin <Mark.Trettin@gmx.de>
 ;; Created: 2002-09-26
diff --git a/style/setspace.el b/style/setspace.el
index 4e32044..311c482 100644
--- a/style/setspace.el
+++ b/style/setspace.el
@@ -1,6 +1,6 @@
-;;; setspace.el --- AUCTeX style for `setspace.sty'
+;;; setspace.el --- AUCTeX style for `setspace.sty'  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2011, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Created: 2011-04-16
diff --git a/style/shortvrb.el b/style/shortvrb.el
index 932df29..313d588 100644
--- a/style/shortvrb.el
+++ b/style/shortvrb.el
@@ -1,4 +1,4 @@
-;;; shortvrb.el --- AUCTeX style for `shortvrb.sty'
+;;; shortvrb.el --- AUCTeX style for `shortvrb.sty'  -*- lexical-binding: t; 
-*-
 
 ;; Copyright (C) 2009, 2014, 2018, 2020 Free Software Foundation, Inc.
 
diff --git a/style/siunitx.el b/style/siunitx.el
index 85fef14..287ea50 100644
--- a/style/siunitx.el
+++ b/style/siunitx.el
@@ -1,6 +1,6 @@
-;;; siunitx.el --- AUCTeX style for `siunitx.sty' version 2.5s.
+;;; siunitx.el --- AUCTeX style for `siunitx.sty' version 2.5s.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2012-2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <giordano.mose@libero.it>
diff --git a/style/slides.el b/style/slides.el
index e73826a..1a33ae4 100644
--- a/style/slides.el
+++ b/style/slides.el
@@ -1,6 +1,6 @@
-;;; slides.el --- AUCTeX style for the `slides' document class
+;;; slides.el --- AUCTeX style for the `slides' document class  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2004, 2013 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2013, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/slovak.el b/style/slovak.el
index dacf6c5..5db2932 100644
--- a/style/slovak.el
+++ b/style/slovak.el
@@ -1,4 +1,4 @@
-;;; slovak.el --- Setup AUCTeX for editing Slovak text.
+;;; slovak.el --- Setup AUCTeX for editing Slovak text.  -*- lexical-binding: 
t; -*-
 
 ;; Silence the compiler:
 (declare-function font-latex-add-quotes
diff --git a/style/sourcecodepro.el b/style/sourcecodepro.el
index 289906d..b3a7f50 100644
--- a/style/sourcecodepro.el
+++ b/style/sourcecodepro.el
@@ -1,6 +1,6 @@
-;;; sourcecodepro.el --- AUCTeX style for `sourcecodepro.sty' (v2.6)
+;;; sourcecodepro.el --- AUCTeX style for `sourcecodepro.sty' (v2.6)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2017, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2017, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/splitidx.el b/style/splitidx.el
index 41141b9..ce7f6e6 100644
--- a/style/splitidx.el
+++ b/style/splitidx.el
@@ -1,6 +1,6 @@
-;;; splitidx.el --- AUCTeX style for `splitidx.sty' (v1.2a)
+;;; splitidx.el --- AUCTeX style for `splitidx.sty' (v1.2a)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/subcaption.el b/style/subcaption.el
index 4a2beab..7993236 100644
--- a/style/subcaption.el
+++ b/style/subcaption.el
@@ -1,6 +1,6 @@
-;;; subcaption.el --- AUCTeX style for `subcaption.sty' (v1.3)
+;;; subcaption.el --- AUCTeX style for `subcaption.sty' (v1.3)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015--2019 Free Software Foundation, Inc.
+;; Copyright (C) 2015--2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/subfigure.el b/style/subfigure.el
index 9d96655..8635508 100644
--- a/style/subfigure.el
+++ b/style/subfigure.el
@@ -1,6 +1,6 @@
-;;; subfigure.el --- AUCTeX style file for subfigure.sty
+;;; subfigure.el --- AUCTeX style file for subfigure.sty  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2003, 2005, 2013, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2005, 2013, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Reiner Steib  <Reiner.Steib@gmx.de>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/subfiles.el b/style/subfiles.el
index 4937bc4..33c22d5 100644
--- a/style/subfiles.el
+++ b/style/subfiles.el
@@ -1,6 +1,6 @@
-;;; subfiles.el --- AUCTeX style for the subfiles package.
+;;; subfiles.el --- AUCTeX style for the subfiles package.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Uwe Brauer <oub@mat.ucm.es>
 ;; Created: 07 Nov 2016
diff --git a/style/swedish.el b/style/swedish.el
index adbfdda..442c3c9 100644
--- a/style/swedish.el
+++ b/style/swedish.el
@@ -1,4 +1,4 @@
-;;; swedish.el --- Setup AUCTeX for editing Swedish text.
+;;; swedish.el --- Setup AUCTeX for editing Swedish text.  -*- 
lexical-binding: t; -*-
 
 ;;; Commentary:
 ;;
diff --git a/style/tabularx.el b/style/tabularx.el
index 2d484db..750e623 100644
--- a/style/tabularx.el
+++ b/style/tabularx.el
@@ -1,6 +1,6 @@
-;;; tabularx.el --- AUCTeX style for the tabularx package.
+;;; tabularx.el --- AUCTeX style for the tabularx package.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2009, 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2013-2016, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@caeruleus.net>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/tabulary.el b/style/tabulary.el
index aa0fcf5..7991438 100644
--- a/style/tabulary.el
+++ b/style/tabulary.el
@@ -1,6 +1,6 @@
-;;; tabulary.el --- AUCTeX style for the tabulary package.
+;;; tabulary.el --- AUCTeX style for the tabulary package.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2016, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/tarticle.el b/style/tarticle.el
index f1bde04..43d047d 100644
--- a/style/tarticle.el
+++ b/style/tarticle.el
@@ -1,6 +1,6 @@
-;;; tarticle.el - Special code for tarticle class.
+;;; tarticle.el - Special code for tarticle class.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2017, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ikumi Keita <ikumi@ikumi.que.jp>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/tbook.el b/style/tbook.el
index 5c4167a..c6ba0fd 100644
--- a/style/tbook.el
+++ b/style/tbook.el
@@ -1,6 +1,6 @@
-;;; tbook.el - Special code for tbook class.
+;;; tbook.el - Special code for tbook class.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2017, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ikumi Keita <ikumi@ikumi.que.jp>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/tcolorbox.el b/style/tcolorbox.el
index cae2662..b421731 100644
--- a/style/tcolorbox.el
+++ b/style/tcolorbox.el
@@ -1,6 +1,6 @@
-;;; tcolorbox.el --- AUCTeX style for `tcolorbox.sty' (v4.00)
+;;; tcolorbox.el --- AUCTeX style for `tcolorbox.sty' (v4.00)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Tassilo Horn <tsdh@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/tcolorboxlib-raster.el b/style/tcolorboxlib-raster.el
index 8d0ab79..f8298fd 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
+;;; tcolorboxlib-raster.el --- AUCTeX style for `raster' library from 
tcolorbox  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/tex-live.el b/style/tex-live.el
index 0750d91..5371b0b 100644
--- a/style/tex-live.el
+++ b/style/tex-live.el
@@ -1,4 +1,4 @@
-;;; tex-live.el --- AUCTeX style for `tex-live.sty'
+;;; tex-live.el --- AUCTeX style for `tex-live.sty'  -*- lexical-binding: t; 
-*-
 
 ;; Copyright (C) 2020 Free Software Foundation, Inc.
 
diff --git a/style/textcomp.el b/style/textcomp.el
index 17d0a0d..c48316c 100644
--- a/style/textcomp.el
+++ b/style/textcomp.el
@@ -1,4 +1,4 @@
-;;; textcomp.el --- AUCTeX style for `textcomp.sty' (v2.0n)
+;;; textcomp.el --- AUCTeX style for `textcomp.sty' (v2.0n)  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2014, 2017, 2020 Free Software Foundation, Inc.
 
diff --git a/style/textpos.el b/style/textpos.el
index 86f9728..0c0a8c1 100644
--- a/style/textpos.el
+++ b/style/textpos.el
@@ -1,6 +1,6 @@
-;;; textpos.el --- AUCTeX style for `textpos.sty' version v1.7j
+;;; textpos.el --- AUCTeX style for `textpos.sty' version v1.7j  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2016 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2016, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/theorem.el b/style/theorem.el
index 7b595e5..f271715 100644
--- a/style/theorem.el
+++ b/style/theorem.el
@@ -1,6 +1,6 @@
-;;; theorem.el --- AUCTeX style for `theorem.sty' (v2.2c)
+;;; theorem.el --- AUCTeX style for `theorem.sty' (v2.2c)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/thm-restate.el b/style/thm-restate.el
index 2176515..cfdeb34 100644
--- a/style/thm-restate.el
+++ b/style/thm-restate.el
@@ -1,6 +1,6 @@
-;;; thm-restate.el --- AUCTeX style for `thm-restate.sty' (v66)
+;;; thm-restate.el --- AUCTeX style for `thm-restate.sty' (v66)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/thmtools.el b/style/thmtools.el
index 20ddb69..438f3e1 100644
--- a/style/thmtools.el
+++ b/style/thmtools.el
@@ -1,6 +1,6 @@
-;;; thmtools.el --- AUCTeX style for `thmtools.sty' (v67)
+;;; thmtools.el --- AUCTeX style for `thmtools.sty' (v67)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2018, 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2018--2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/tikz.el b/style/tikz.el
index ded4d25..8e1d187 100644
--- a/style/tikz.el
+++ b/style/tikz.el
@@ -1,4 +1,4 @@
-;;; tikz.el --- AUCTeX style for `tikz.sty'
+;;; tikz.el --- AUCTeX style for `tikz.sty'  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2016, 2020 Free Software Foundation, Inc.
 
diff --git a/style/titleps.el b/style/titleps.el
index 5580fbb..e6514f5 100644
--- a/style/titleps.el
+++ b/style/titleps.el
@@ -1,6 +1,6 @@
-;;; titleps.el --- AUCTeX style for `titleps.sty' (v1.1.1)
+;;; titleps.el --- AUCTeX style for `titleps.sty' (v1.1.1)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/titlesec.el b/style/titlesec.el
index e8922af..1d88bf8 100644
--- a/style/titlesec.el
+++ b/style/titlesec.el
@@ -1,6 +1,6 @@
-;;; titlesec.el --- AUCTeX style for `titlesec.sty' (v2.11)
+;;; titlesec.el --- AUCTeX style for `titlesec.sty' (v2.11)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2016--2019 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/titletoc.el b/style/titletoc.el
index 454fc9a..9151005 100644
--- a/style/titletoc.el
+++ b/style/titletoc.el
@@ -1,6 +1,6 @@
-;;; titletoc.el --- AUCTeX style for `titletoc.sty' (v1.6)
+;;; titletoc.el --- AUCTeX style for `titletoc.sty' (v1.6)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2016, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2016, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/transparent.el b/style/transparent.el
index 309eb01..2741af2 100644
--- a/style/transparent.el
+++ b/style/transparent.el
@@ -1,6 +1,6 @@
-;;; transparent.el --- AUCTeX style for `transparent.sty' (v1.0)
+;;; transparent.el --- AUCTeX style for `transparent.sty' (v1.0)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/treport.el b/style/treport.el
index 583b01f..561c3e8 100644
--- a/style/treport.el
+++ b/style/treport.el
@@ -1,6 +1,6 @@
-;;; treport.el - Special code for treport class.
+;;; treport.el - Special code for treport class.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2017, 2020 Free Software Foundation, Inc.
 
 ;; Author: Ikumi Keita <ikumi@ikumi.que.jp>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/ulem.el b/style/ulem.el
index 77bf1d3..94a9179 100644
--- a/style/ulem.el
+++ b/style/ulem.el
@@ -1,6 +1,6 @@
-;;; ulem.el --- AUCTeX style for `ulem.sty'
+;;; ulem.el --- AUCTeX style for `ulem.sty'  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2012, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2012, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Keywords: tex
diff --git a/style/unicode-math.el b/style/unicode-math.el
index 395e137..7eb4dbb 100644
--- a/style/unicode-math.el
+++ b/style/unicode-math.el
@@ -1,6 +1,6 @@
-;;; unicode-math.el --- AUCTeX style for `unicode-math.sty' version 0.7e.
+;;; unicode-math.el --- AUCTeX style for `unicode-math.sty' version 0.7e.  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2013, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2013, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Author: Mosè Giordano <giordano.mose@libero.it>
diff --git a/style/units.el b/style/units.el
index f174453..c076853 100644
--- a/style/units.el
+++ b/style/units.el
@@ -1,6 +1,6 @@
-;;; units.el --- AUCTeX style for the LaTeX package `units.sty' (v0.9b)
+;;; units.el --- AUCTeX style for the LaTeX package `units.sty' (v0.9b)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2004, 2005, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Christian Schlauer <cschl@arcor.de>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/url.el b/style/url.el
index 740d2d7..8d468de 100644
--- a/style/url.el
+++ b/style/url.el
@@ -1,4 +1,4 @@
-;;; url.el --- AUCTeX style for `url.sty'
+;;; url.el --- AUCTeX style for `url.sty'  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2004-2005, 2018, 2020 Free Software Foundation, Inc.
 
diff --git a/style/varioref.el b/style/varioref.el
index d5e7e0d..706375b 100644
--- a/style/varioref.el
+++ b/style/varioref.el
@@ -1,6 +1,6 @@
-;;; varioref.el --- AUCTeX style for `varioref.sty' (v1.6b)
+;;; varioref.el --- AUCTeX style for `varioref.sty' (v1.6b)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 1999, 2013, 2015, 2018, 2019 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2013, 2015, 2018--2020 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@strw.leidenuniv.nl>
 ;;         Mads Jensen <mje@inducks.org>
diff --git a/style/verbatim.el b/style/verbatim.el
index d4cb5fe..6ba337c 100644
--- a/style/verbatim.el
+++ b/style/verbatim.el
@@ -1,4 +1,4 @@
-;;; verbatim.el --- Style hook for the verbatim package.
+;;; verbatim.el --- Style hook for the verbatim package.  -*- lexical-binding: 
t; -*-
 
 ;; Copyright (C) 2001, 2020 Free Software Foundation, Inc.
 
diff --git a/style/virtex.el b/style/virtex.el
index e774b46..3f9690d 100644
--- a/style/virtex.el
+++ b/style/virtex.el
@@ -1,4 +1,4 @@
-;;; virtex.el - Common code for all TeX formats.
+;;; virtex.el - Common code for all TeX formats.  -*- lexical-binding: t; -*-
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 
diff --git a/style/vwcol.el b/style/vwcol.el
index c85e815..3c7641a 100644
--- a/style/vwcol.el
+++ b/style/vwcol.el
@@ -1,6 +1,6 @@
-;;; vwcol.el --- AUCTeX style for `vwcol.sty' (v0.2)
+;;; vwcol.el --- AUCTeX style for `vwcol.sty' (v0.2)  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2015, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/wrapfig.el b/style/wrapfig.el
index 11fe473..a7fd716 100644
--- a/style/wrapfig.el
+++ b/style/wrapfig.el
@@ -1,4 +1,4 @@
-;;; wrapfig.el --- AUCTeX style for `wrapfig.sty' version v3.6
+;;; wrapfig.el --- AUCTeX style for `wrapfig.sty' version v3.6  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2014, 2015 Free Software Foundation, Inc.
 
diff --git a/style/xcolor.el b/style/xcolor.el
index 3d77b35..bfdda99 100644
--- a/style/xcolor.el
+++ b/style/xcolor.el
@@ -1,6 +1,6 @@
-;; xcolor.el --- AUCTeX style for `xcolor.sty' (v2.12)
+;; xcolor.el --- AUCTeX style for `xcolor.sty' (v2.12)  -*- lexical-binding: 
t; -*-
 
-;; Copyright (C) 2016--2019 Free Software Foundation, Inc.
+;; Copyright (C) 2016--2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/xkcdcolors.el b/style/xkcdcolors.el
index acacfe2..70bcee7 100644
--- a/style/xkcdcolors.el
+++ b/style/xkcdcolors.el
@@ -1,6 +1,6 @@
-;;; xkcdcolors.el --- AUCTeX style for `xkcdcolors.sty' (v1.0.1)
+;;; xkcdcolors.el --- AUCTeX style for `xkcdcolors.sty' (v1.0.1)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2019, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/xltabular.el b/style/xltabular.el
index af34313..7e2576b 100644
--- a/style/xltabular.el
+++ b/style/xltabular.el
@@ -1,6 +1,6 @@
-;;; xltabular.el --- AUCTeX style for `xltabular.sty' (v0.05)
+;;; xltabular.el --- AUCTeX style for `xltabular.sty' (v0.05)  -*- 
lexical-binding: t; -*-
 
-;; Copyright (C) 2017 Free Software Foundation, Inc.
+;; Copyright (C) 2017, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/xparse.el b/style/xparse.el
index 79ab604..f75c16a 100644
--- a/style/xparse.el
+++ b/style/xparse.el
@@ -1,4 +1,4 @@
-;;; xparse.el --- AUCTeX style for `xparse.sty' version 2020-03-06
+;;; xparse.el --- AUCTeX style for `xparse.sty' version 2020-03-06  -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2013, 2020 Free Software Foundation, Inc.
 
diff --git a/style/xspace.el b/style/xspace.el
index 86c1e46..3d37cac 100644
--- a/style/xspace.el
+++ b/style/xspace.el
@@ -1,6 +1,6 @@
-;;; xspace.el --- AUCTeX style for `xspace.sty'
+;;; xspace.el --- AUCTeX style for `xspace.sty'  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2011, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2011, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Mads Jensen <mje@inducks.org>
 ;; Maintainer: auctex-devel@gnu.org
diff --git a/style/zlmtt.el b/style/zlmtt.el
index 2b075cf..7bc6fb6 100644
--- a/style/zlmtt.el
+++ b/style/zlmtt.el
@@ -1,6 +1,6 @@
-;;; zlmtt.el --- AUCTeX style for `zlmtt.sty' (v1.01)
+;;; zlmtt.el --- AUCTeX style for `zlmtt.sty' (v1.01)  -*- lexical-binding: t; 
-*-
 
-;; Copyright (C) 2014, 2018 Free Software Foundation, Inc.
+;; Copyright (C) 2014, 2018, 2020 Free Software Foundation, Inc.
 
 ;; Author: Arash Esbati <arash@gnu.org>
 ;; Maintainer: auctex-devel@gnu.org

commit 384c1d2528eba44cd53d8ea42e151c7b4445bafd
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Date:   Tue Sep 22 22:01:45 2020 +0900

    Use declared dynamic variable in tex-jp
    
    * tex-jp.el (TeX-expand-list-builtin): Replace former dynamic var
    `pos' with `TeX-expand-pos'.
    (): Enable lexical binding.
    Move `coding' tag to the File Local Variable section at EOF.
    Update copyright year.

diff --git a/tex-jp.el b/tex-jp.el
index dff1b11..41ea4c5 100644
--- a/tex-jp.el
+++ b/tex-jp.el
@@ -1,6 +1,6 @@
-;;; tex-jp.el --- Support for Japanese TeX.  -*- coding: iso-2022-jp-unix; -*-
+;;; tex-jp.el --- Support for Japanese TeX.  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 1999, 2001-2008, 2012-2013, 2016-2018
+;; Copyright (C) 1999, 2001-2008, 2012-2013, 2016-2018, 2020
 ;;   Free Software Foundation, Inc.
 
 ;; Author:     KOBAYASHI Shinji <koba@flab.fujitsu.co.jp>,
@@ -148,7 +148,8 @@ systems are determined by their values regardless of the 
kanji option."
                          (let ((result (format "-d %s" dicname)))
                            ;; Advance past the file name in order to
                            ;; prevent expanding any substring of it.
-                           (setq pos (+ pos (length result)))
+                           (setq TeX-expand-pos
+                                 (+ TeX-expand-pos (length result)))
                            result)
                        ""))))
         ;; pxdvi $B$H(B %(o?)xdvi $B$NE,@Z$JJ}$rA*Br$9$k!#(B
@@ -912,4 +913,8 @@ save size
 
 (provide 'tex-jp)
 
+;; Local Variables:
+;; coding: iso-2022-jp-unix
+;; End:
+
 ;;; tex-jp.el ends here

commit 2e196d21b9ffd2fd2e9a0b130bf6129b1abbee4b
Author: Arash Esbati <arash@gnu.org>
Date:   Mon Sep 14 17:13:30 2020 +0200

    ; Silence the compiler
    
    * tex.el: defvar `dbus-debug'.
    (TeX-source-specials-view-expand-options, TeX-arg-literal): Mark
    unused parameters.

diff --git a/tex.el b/tex.el
index dd74f07..4481bd1 100644
--- a/tex.el
+++ b/tex.el
@@ -106,6 +106,7 @@
 ;; Others:
 (defvar tex--prettify-symbols-alist)   ; tex-mode.el
 (defvar Info-file-list-for-emacs)      ; info.el
+(defvar dbus-debug)                     ; dbus.el
 
 (defgroup TeX-file nil
   "Files used by AUCTeX."
@@ -2022,7 +2023,7 @@ Return the full path to the executable if possible."
        (concat client-full " " options)
       (concat client-base " " options))))
 
-(defun TeX-source-specials-view-expand-options (&optional viewer)
+(defun TeX-source-specials-view-expand-options (&optional _viewer)
   "Return source specials command line option for viewer command.
 The return value depends on the values of
 `TeX-source-correlate-mode' and
@@ -3621,11 +3622,11 @@ Unless optional argument COMPLETE is non-nil, ``: '' 
will be appended."
        (TeX-parse-argument optional (car args))
       (TeX-parse-argument optional args))))
 
-(defun TeX-arg-literal (optional &rest args)
+(defun TeX-arg-literal (_optional &rest args)
   "Insert its arguments ARGS into the buffer.
 Used for specifying extra syntax for a macro.  The compatibility
 argument OPTIONAL is ignored."
-  (apply 'insert args))
+  (apply #'insert args))
 
 
 ;;; Font Locking

commit 717e5f0a9adc9945eb75191861f816fc1e8e9136
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Date:   Sat Sep 12 17:35:48 2020 +0900

    Simplify nested `let's
    
    * tex-buf.el (TeX-active-master-with-quotes): Simplify nested `let's
    into singe one.

diff --git a/tex-buf.el b/tex-buf.el
index 9b04a07..bb5e275 100644
--- a/tex-buf.el
+++ b/tex-buf.el
@@ -585,30 +585,30 @@ infinite loop in `TeX-command-expand'.
 
 Helper function of `TeX-command-expand'. Use only within entries in
 `TeX-expand-list-builtin' and `TeX-expand-list'."
-  (let ((res
-        (shell-quote-argument
-         (let* ((raw (TeX-active-master extension nondirectory ask))
-                ;; String `TeX-command-text' means that the file name is
-                ;; given through \input command.
-                (quote-for-space (if (and (stringp TeX-command-text)
-                                          (string-match " " raw))
-                                     "\"" "")))
-           (format
-            (if (and extra
-                     (stringp TeX-command-text)
-                     (memq major-mode '(latex-mode doctex-mode))
-                     (memq TeX-engine '(default uptex)))
-                ;; Since TeXLive 2018, the default encoding for LaTeX
-                ;; files has been changed to UTF-8 if used with
-                ;; classic TeX or pdfTeX.  I.e.,
-                ;; \usepackage[utf8]{inputenc} is enabled by default
-                ;; in (pdf)latex.
-                ;; c.f. LaTeX News issue 28
-                ;; Due to this change, \detokenize is required to
-                ;; recognize non-ascii characters in the file name
-                ;; when \input precedes.
-                "\\detokenize{ %s }" "%s")
-            (concat quote-for-space raw quote-for-space))))))
+  (let* ((raw (TeX-active-master extension nondirectory ask))
+        ;; String `TeX-command-text' means that the file name is
+        ;; given through \input command.
+        (quote-for-space (if (and (stringp TeX-command-text)
+                                  (string-match " " raw))
+                             "\"" ""))
+        (res
+         (shell-quote-argument
+          (format
+           (if (and extra
+                    (stringp TeX-command-text)
+                    (memq major-mode '(latex-mode doctex-mode))
+                    (memq TeX-engine '(default uptex)))
+               ;; Since TeXLive 2018, the default encoding for LaTeX
+               ;; files has been changed to UTF-8 if used with
+               ;; classic TeX or pdfTeX.  I.e.,
+               ;; \usepackage[utf8]{inputenc} is enabled by default
+               ;; in (pdf)latex.
+               ;; c.f. LaTeX News issue 28
+               ;; Due to this change, \detokenize is required to
+               ;; recognize non-ascii characters in the file name
+               ;; when \input precedes.
+               "\\detokenize{ %s }" "%s")
+           (concat quote-for-space raw quote-for-space)))))
     ;; Advance past the file name in order to
     ;; prevent expanding any substring of it.
     (setq TeX-expand-pos

commit bf30c1106f87ed14ec09e9c735f37c071743c802
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Date:   Sat Sep 12 14:52:35 2020 +0900

    Make "%o" compatible again with file name with spaces
    
    * tex-buf.el (TeX-active-master-with-quotes): Rename from
    `TeX--master-or-region-file-with-extra-quotes' and make public.
    Incorporate adjust of `TeX-expand-pos' from `TeX-command-expand'.
    (TeX-command-expand): Simplify.
    * tex.el (TeX-expand-list-builtin): Use renamed function instead of
    `TeX-active-master'.
    * tests/tex/command-expansion.el (TeX-command-expand-skip-file-name):
    Include "%o" in test.
    (TeX-command-expand-file-name-with-spaces): New test.
    (TeX-command-detokenize): Add case where `TeX-master' has space.

diff --git a/tests/tex/command-expansion.el b/tests/tex/command-expansion.el
index bb5c7d4..3b2779d 100644
--- a/tests/tex/command-expansion.el
+++ b/tests/tex/command-expansion.el
@@ -88,13 +88,20 @@
   ;; Skip on w32 because the quoting style of `shell-quote-argument'
   ;; is different.
   (skip-unless (not (eq system-type 'windows-nt)))
-  (should (string=
-           (let ((major-mode 'latex-mode)
-                (TeX-engine 'default)
-                (TeX-master "/tmp/abc")
-                (TeX-command-extra-options " \"\\foo\""))
-            (TeX-command-expand "%`%(extraopts)%' %T"))
-          " \"\\foo\" \"\\input\" \\\\detokenize\\{\\ abc.tex\\ \\}")))
+  (let ((major-mode 'latex-mode)
+       (TeX-engine 'default)
+       (TeX-command-extra-options " \"\\foo\"")
+       TeX-master)
+
+    (setq TeX-master "/tmp/abc")
+    (should (string=
+            (TeX-command-expand "%`%(extraopts)%' %T")
+            " \"\\foo\" \"\\input\" \\\\detokenize\\{\\ abc.tex\\ \\}"))
+
+    (setq TeX-master "/tmp/abc def")
+    (should (string=
+            (TeX-command-expand "%`%(extraopts)%' %T")
+            " \"\\foo\" \"\\input\" \\\\detokenize\\{\\ \\\"abc\\ 
def.tex\\\"\\ \\}"))))
 
 (ert-deftest TeX-command-expand-skip-file-name ()
   "Check whether file name is not subject to further expansion.
@@ -105,6 +112,7 @@ See 
<https://lists.gnu.org/r/bug-auctex/2014-08/msg00012.html>."
   ;; is different.
   (skip-unless (not (eq system-type 'windows-nt)))
   (let ((TeX-master "abc-def")
+       (TeX-output-extension "pdf")
        (TeX-expand-list '(("-" (lambda () ":")))))
     (should (string=
             (TeX-command-expand "%s")
@@ -121,12 +129,9 @@ See 
<https://lists.gnu.org/r/bug-auctex/2014-08/msg00012.html>."
     (should (string=
             (TeX-command-expand "%f")
             (TeX-master-file "ps" t)))
-    ;; The expander of "%o" does not yet cater for this possible endless
-    ;; loop.
-    ;; (should (string=
-    ;;              (TeX-command-expand "%o")
-    ;;              (TeX-master-file "pdf" t)))
-    ))
+    (should (string=
+            (TeX-command-expand "%o")
+            (TeX-master-file "pdf" t)))))
 
 (ert-deftest TeX-command-expand-active-master ()
   "Test whether `TeX-active-master' is valid argument for 
`TeX-command-expand'."
@@ -144,4 +149,27 @@ See 
<https://lists.gnu.org/r/bug-auctex/2014-08/msg00012.html>."
             (TeX-command-expand "%s")
             TeX-region))))
 
+(ert-deftest TeX-command-expand-file-name-with-spaces ()
+  "Test whether file name with spaces is quoted correctly."
+  (let ((TeX-master "abc def")
+       (TeX-output-extension "pdf"))
+    (should (string=
+            (TeX-command-expand "%s")
+            (shell-quote-argument TeX-master)))
+    (should (string=
+            (TeX-command-expand "%t")
+            (shell-quote-argument (TeX-master-file "tex" t))))
+    (should (string=
+            (TeX-command-expand "%T")
+            (shell-quote-argument (TeX-master-file "tex" t))))
+    (should (string=
+            (TeX-command-expand "%d")
+            (shell-quote-argument (TeX-master-file "dvi" t))))
+    (should (string=
+            (TeX-command-expand "%f")
+            (shell-quote-argument (TeX-master-file "ps" t))))
+    (should (string=
+            (TeX-command-expand "%o")
+            (shell-quote-argument (TeX-master-file "pdf" t))))))
+
 ;;; command-expansion.el ends here
diff --git a/tex-buf.el b/tex-buf.el
index 134bf36..9b04a07 100644
--- a/tex-buf.el
+++ b/tex-buf.el
@@ -557,13 +557,6 @@ without further expansion."
            arguments (cdr (cdr entry)) ;Remaining elements
            string (save-match-data
                     (cond
-                      ((eq expansion #'TeX-active-master)
-                       (let ((res (apply 
#'TeX--master-or-region-file-with-extra-quotes arguments)))
-                         ;; Advance past the file name in order to
-                         ;; prevent expanding any substring of it.
-                         (setq TeX-expand-pos
-                               (+ TeX-expand-pos (length res)))
-                         res))
                       ((functionp expansion)
                        (apply expansion arguments))
                      ((boundp expansion)
@@ -575,7 +568,7 @@ without further expansion."
                (replace-match string t t TeX-expand-command))))
     TeX-expand-command))
 
-(defun TeX--master-or-region-file-with-extra-quotes
+(defun TeX-active-master-with-quotes
     (&optional extension nondirectory ask extra)
   "Return the current master or region file name with quote for shell.
 Pass arguments EXTENSION NONDIRECTORY ASK to `TeX-active-master'.
@@ -587,31 +580,40 @@ the following three conditions are met:
   1. compiling with standard (pdf)LaTeX or upLaTeX
   2. \" \\input\" is supplemented
   3. EXTRA is non-nil (default when expanding \"%T\")
-
-Helper function of `TeX-command-expand'."
-  (shell-quote-argument
-   (let* ((raw (TeX-active-master extension nondirectory ask))
-         ;; String `TeX-command-text' means that the file name is
-         ;; given through \input command.
-         (quote-for-space (if (and (stringp TeX-command-text)
-                                   (string-match " " raw))
-                              "\"" "")))
-     (format
-      (if (and extra
-              (stringp TeX-command-text)
-              (memq major-mode '(latex-mode doctex-mode))
-              (memq TeX-engine '(default uptex)))
-         ;; Since TeXLive 2018, the default encoding for LaTeX
-         ;; files has been changed to UTF-8 if used with
-         ;; classic TeX or pdfTeX.  I.e.,
-         ;; \usepackage[utf8]{inputenc} is enabled by default
-         ;; in (pdf)latex.
-         ;; c.f. LaTeX News issue 28
-         ;; Due to this change, \detokenize is required to
-         ;; recognize non-ascii characters in the file name
-         ;; when \input precedes.
-         "\\detokenize{ %s }" "%s")
-      (concat quote-for-space raw quote-for-space)))))
+Adjust dynamically bound variable `TeX-expand-pos' to avoid possible
+infinite loop in `TeX-command-expand'.
+
+Helper function of `TeX-command-expand'. Use only within entries in
+`TeX-expand-list-builtin' and `TeX-expand-list'."
+  (let ((res
+        (shell-quote-argument
+         (let* ((raw (TeX-active-master extension nondirectory ask))
+                ;; String `TeX-command-text' means that the file name is
+                ;; given through \input command.
+                (quote-for-space (if (and (stringp TeX-command-text)
+                                          (string-match " " raw))
+                                     "\"" "")))
+           (format
+            (if (and extra
+                     (stringp TeX-command-text)
+                     (memq major-mode '(latex-mode doctex-mode))
+                     (memq TeX-engine '(default uptex)))
+                ;; Since TeXLive 2018, the default encoding for LaTeX
+                ;; files has been changed to UTF-8 if used with
+                ;; classic TeX or pdfTeX.  I.e.,
+                ;; \usepackage[utf8]{inputenc} is enabled by default
+                ;; in (pdf)latex.
+                ;; c.f. LaTeX News issue 28
+                ;; Due to this change, \detokenize is required to
+                ;; recognize non-ascii characters in the file name
+                ;; when \input precedes.
+                "\\detokenize{ %s }" "%s")
+            (concat quote-for-space raw quote-for-space))))))
+    ;; Advance past the file name in order to
+    ;; prevent expanding any substring of it.
+    (setq TeX-expand-pos
+          (+ TeX-expand-pos (length res)))
+    res))
 
 (defun TeX-check-files (derived originals extensions)
   "Check if DERIVED is newer than any of the ORIGINALS.
diff --git a/tex.el b/tex.el
index efcb8e1..dd74f07 100644
--- a/tex.el
+++ b/tex.el
@@ -80,7 +80,6 @@
 (defvar TeX-mode-map)
 (defvar TeX-mode-p)
 (defvar TeX-output-extension)
-(defvar TeX-output-extension)
 (defvar TeX-source-correlate-mode)
 (defvar TeX-source-specials-places)
 (defvar TeX-source-specials-tex-flags)
@@ -590,10 +589,11 @@ string."
                    (or (if TeX-source-correlate-output-page-function
                            (funcall TeX-source-correlate-output-page-function))
                        "1")))
-    ;; `TeX-active-master' calls either calls`TeX-master-file' or
-    ;; `TeX-region-file' returning the master or region file.
-    ("%s" TeX-active-master nil t)
-    ("%t" TeX-active-master t t)
+    ;; `TeX-active-master-with-quotes' calls either `TeX-master-file'
+    ;; or `TeX-region-file' returning the master or region file, and
+    ;; adds suitable quotes for use in shell command line.
+    ("%s" TeX-active-master-with-quotes nil t)
+    ("%t" TeX-active-master-with-quotes t t)
     ;; If any TeX codes appear in the interval between %` and %', move
     ;; all of them after the interval and supplement " \input".  The
     ;; appearance is marked by leaving the bind to `TeX-command-text'
@@ -636,15 +636,14 @@ string."
                  (setq TeX-expand-pos (+ TeX-expand-pos (length 
TeX-command-text) 9))
                  (concat TeX-command-text " \"\\input\""))
              "")))
-    ;; The fourth argument of t is actually for wrapper function
-    ;; provided by `TeX--master-or-region-file-with-extra-quotes'.
-    ;; See its doc string as well as the comments in
-    ;; `TeX-command-expand'.
-    ("%T" TeX-active-master t t nil t)
+    ;; The fourth argument of t directs to supply "\detokenize{}" when
+    ;; necessary. See doc string and comment of
+    ;; `TeX-active-master-with-quotes'.
+    ("%T" TeX-active-master-with-quotes t t nil t)
     ("%n" TeX-current-line)
-    ("%d" TeX-active-master "dvi" t)
-    ("%f" TeX-active-master "ps" t)
-    ("%o" (lambda nil (TeX-active-master (TeX-output-extension) t)))
+    ("%d" TeX-active-master-with-quotes "dvi" t)
+    ("%f" TeX-active-master-with-quotes "ps" t)
+    ("%o" (lambda nil (TeX-active-master-with-quotes (TeX-output-extension) 
t)))
     ;; for source specials the file name generated for the xdvi
     ;; command needs to be relative to the master file, just in
     ;; case the file is in a different subdirectory

commit 89515499379810aa6f89afb78d6bc128e62c9944
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Date:   Sat Sep 12 01:44:18 2020 +0900

    ; Trivial cleanups
    
    * tex-buf.el (TeX-command-expand): Omit one `let'.
    (TeX--master-or-region-file-with-extra-quotes): Omit spurious `funcall'.
    Add descriptions about arguments in doc-string.
    * tex.el (declare-function): Fix arglist for updated
    `TeX-command-expand'.

diff --git a/tex-buf.el b/tex-buf.el
index b9d9085..134bf36 100644
--- a/tex-buf.el
+++ b/tex-buf.el
@@ -550,48 +550,47 @@ without further expansion."
                             "%"))
                (or list (TeX-expand-list)))
          pat (regexp-opt (mapcar #'car list)))
-    (let ((file-fn #'TeX--master-or-region-file-with-extra-quotes))
-      (while (setq TeX-expand-pos (string-match pat TeX-expand-command 
TeX-expand-pos))
-        (setq string (match-string 0 TeX-expand-command)
-             entry (assoc string list)
-             expansion (car (cdr entry)) ;Second element
-             arguments (cdr (cdr entry)) ;Remaining elements
-             string (save-match-data
-                      (cond
-                        ((memq expansion (list 'TeX-active-master
-                                               #'TeX-active-master))
-                         (let ((res (apply file-fn arguments)))
-                           ;; Advance past the file name in order to
-                           ;; prevent expanding any substring of it.
-                           (setq TeX-expand-pos
-                                 (+ TeX-expand-pos (length res)))
-                           res))
-                        ((functionp expansion)
-                         (apply expansion arguments))
-                       ((boundp expansion)
-                         (apply (symbol-value expansion) arguments))
-                       (t
-                        (error "Nonexpansion %s" expansion)))))
-        (if (stringp string)
-           (setq TeX-expand-command
-                 (replace-match string t t TeX-expand-command))))
-      TeX-expand-command)))
+    (while (setq TeX-expand-pos (string-match pat TeX-expand-command 
TeX-expand-pos))
+      (setq string (match-string 0 TeX-expand-command)
+           entry (assoc string list)
+           expansion (car (cdr entry)) ;Second element
+           arguments (cdr (cdr entry)) ;Remaining elements
+           string (save-match-data
+                    (cond
+                      ((eq expansion #'TeX-active-master)
+                       (let ((res (apply 
#'TeX--master-or-region-file-with-extra-quotes arguments)))
+                         ;; Advance past the file name in order to
+                         ;; prevent expanding any substring of it.
+                         (setq TeX-expand-pos
+                               (+ TeX-expand-pos (length res)))
+                         res))
+                      ((functionp expansion)
+                       (apply expansion arguments))
+                     ((boundp expansion)
+                       (apply (symbol-value expansion) arguments))
+                     (t
+                      (error "Nonexpansion %s" expansion)))))
+      (if (stringp string)
+         (setq TeX-expand-command
+               (replace-match string t t TeX-expand-command))))
+    TeX-expand-command))
 
 (defun TeX--master-or-region-file-with-extra-quotes
     (&optional extension nondirectory ask extra)
   "Return the current master or region file name with quote for shell.
-I.e. it encloses the file name with space within quotes `\"'
-first when \" \\input\" is supplemented (indicated by dynamically
-binded variable `TeX-command-text' having string value.)  It also
-encloses the file name within \\detokenize{} when the following
-three conditions are met:
+Pass arguments EXTENSION NONDIRECTORY ASK to `TeX-active-master'.
+If the returned file name contains space, enclose it within
+quotes `\"' when \" \\input\" is supplemented (indicated by
+dynamically bound variable `TeX-command-text' having string
+value.) Also enclose the file name within \\detokenize{} when
+the following three conditions are met:
   1. compiling with standard (pdf)LaTeX or upLaTeX
   2. \" \\input\" is supplemented
   3. EXTRA is non-nil (default when expanding \"%T\")
 
 Helper function of `TeX-command-expand'."
   (shell-quote-argument
-   (let* ((raw (funcall #'TeX-active-master extension nondirectory ask))
+   (let* ((raw (TeX-active-master extension nondirectory ask))
          ;; String `TeX-command-text' means that the file name is
          ;; given through \input command.
          (quote-for-space (if (and (stringp TeX-command-text)
diff --git a/tex.el b/tex.el
index ce31831..efcb8e1 100644
--- a/tex.el
+++ b/tex.el
@@ -53,7 +53,7 @@
 (declare-function TeX-output-extension "tex-buf"
                  nil)
 (declare-function TeX-command-expand "tex-buf"
-                 (command file &optional list))
+                 (command &optional list))
 (declare-function TeX-active-master "tex-buf"
                  (&optional extension nondirectory ignore))
 (declare-function TeX-pop-to-buffer "tex-buf"

commit 8afd11ee39949221dd2fa22182f961597a34b0e4
Author: Arash Esbati <arash@gnu.org>
Date:   Sat Sep 5 23:10:58 2020 +0200

    ; Silence the compiler
    
    * latex.el (TeX-arg-conditional, TeX-arg-verb, TeX-arg-pair): Mark
    unused parameters and adjust docstrings accordingly.

diff --git a/latex.el b/latex.el
index f74c76d..0032157 100644
--- a/latex.el
+++ b/latex.el
@@ -1961,14 +1961,12 @@ It will setup BibTeX to store keys in an auto file."
 
 ;;; Macro Argument Hooks
 
-(defun TeX-arg-conditional (optional expr then else)
+(defun TeX-arg-conditional (_optional expr then else)
   "Implement if EXPR THEN ELSE.
 
-If OPTIONAL is non-nil, insert the resulting value as an optional
-argument, otherwise as a mandatory one.
-
-If EXPR evaluate to true, parse THEN as an argument list, else parse
-ELSE as an argument list."
+If EXPR evaluate to true, parse THEN as an argument list, else
+parse ELSE as an argument list.  The compatibility argument
+OPTIONAL is ignored."
   (TeX-parse-arguments (if (eval expr) then else)))
 
 (defun TeX-arg-eval (optional &rest args)
@@ -2673,10 +2671,9 @@ the list of defined pagestyles."
   :group 'LaTeX-macro
   :type 'character)
 
-(defun TeX-arg-verb (optional &optional _ignore)
+(defun TeX-arg-verb (_optional &optional _ignore)
   "Prompt for delimiter and text.
-If OPTIONAL is non-nil, insert the resulting value as an optional
-argument, otherwise as a mandatory one.  IGNORE is ignored."
+The compatibility argument OPTIONAL and IGNORE are ignored."
   (let ((del (read-quoted-char
              (concat "Delimiter (default "
                      (char-to-string LaTeX-default-verb-delimiter) "): "))))
@@ -2721,16 +2718,13 @@ argument in delimiters like \"\| \|\" or braces \"\{ 
\}\"."
     (unless (= del ?\{)
       (setq LaTeX-default-verb-delimiter del))))
 
-(defun TeX-arg-pair (optional first second)
+(defun TeX-arg-pair (_optional first second)
   "Insert a pair of number, prompted by FIRST and SECOND.
 
 The numbers are surounded by parenthesizes and separated with a
-comma.
-
-If OPTIONAL is non-nil, insert the resulting value as an optional
-argument, otherwise as a mandatory one."
+comma.  The compatibility argument OPTIONAL is ignored."
   (insert "(" (TeX-read-string (concat first  ": ")) ","
-             (TeX-read-string (concat second ": ")) ")"))
+         (TeX-read-string (concat second ": ")) ")"))
 
 (defun TeX-arg-size (optional)
   "Insert width and height as a pair.

commit dabe30c9a957c9c0f9ca7aa309f1d370401fa91b
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Date:   Sun Sep 6 00:18:33 2020 +0900

    Arrange test condition
    
    * latex.el (LaTeX-env-args): Just test nil or not since
    `TeX-exit-mark' is now always bound.

diff --git a/latex.el b/latex.el
index 2dc00ba..f74c76d 100644
--- a/latex.el
+++ b/latex.el
@@ -1316,9 +1316,8 @@ Just like array and tabular."
   (save-excursion
     (LaTeX-find-matching-begin)
     (end-of-line)
-    (let ((TeX-exit-mark (if (boundp 'TeX-exit-mark)
-                            TeX-exit-mark
-                          (make-marker))))
+    (let ((TeX-exit-mark (or TeX-exit-mark
+                            (make-marker))))
       (TeX-parse-arguments args))))
 
 (defun LaTeX-env-label-as-keyval (_optional &optional keyword keyvals 
environment)

commit f7c0c735d48c822a9df0ad486817084c9511d6bd
Author: Tassilo Horn <tsdh@gnu.org>
Date:   Fri Sep 4 17:19:57 2020 +0200

    Enable lexical-binding for AUCTeX core files
    
    * tex.el: Enable lexical-binding.
    (TeX-command-text,TeX-command-pos): Moved from tex-buf.el.
    (TeX-expand-pos,TeX-expand-command): New defvars used in place of `pos' and
    `command' in TeX-expand-list{,-builtin} entries.
    (TeX-expand-list-builtin): Use TeX-expand-pos and TeX-expand-command 
(instead
    of pos and command).  Use TeX-active-master instead of formerly dynamically
    bound `file'.
    (TeX-view-command-raw): Adapt to TeX-command-expand signature change.
    (TeX-exit-mark): New defvar.
    (TeX-parse-macro): Adapt docstring; bind and use TeX-exit-mark instead of
    exit-mark.
    (TeX-last-optional-rejected): New defvar.
    (TeX-parse-arguments): Use TeX-last-optional-rejected instead of
    last-optional-rejected.
    (TeX-parse-argument): Use TeX-exit-mark instead of exit-mark.
    (TeX-argument-insert): Use TeX-exit-mark and TeX-last-optional-rejected 
instead
    of the former unprefixed variables.
    (TeX-safe-auto-write,TeX-auto-untabify,TeX-auto-parse-region,TeX-verbatim-p)
    (TeX-submit-bug-report): Prefix unused var with _.
    (TeX-mode-specific-command-menu-entries): Don't bind `file'.
    (TeX-doc): Remove unused var `doc'.
    (TeX-run-ispell): Remove unused var `found'.
    (TeX-ispell-document): Use `when' instead of `if' with `progn'.
    * tex-buf.el: Enable lexical-binding.
    (TeX-command-expand): Remove file argument but use TeX-active-master 
instead.
    (TeX-command): Rename file argument to file-fn; adapt to TeX-command-expand
    signature change.
    (TeX--master-or-region-file-with-extra-quotes): Remove file-fn argument.
    * latex.el: Enable lexical-binding.
    (LaTeX-title,LaTeX-name,LaTeX-level,LaTeX-done-mark,LaTeX-toc): New defvars.
    (LaTeX-section): Bind them.
    (LaTeX-section-hook): Adapt docstring to the new defvars.
    (LaTeX-section-section): Ditto, and use the new defvars.
    
(LaTeX-section-heading,LaTeX-section-title,LaTeX-section-toc,LaTeX-section-label):
    Use the new defvars.
    (LaTeX-env-args): Use TeX-exit-mark instead of exit-mark.
    (TeX-arg-index): Prefix unused argument args with _.
    (TeX-arg-cite): Prefix unused argument definition with _.
    (LaTeX-mark-environment,LaTeX-forward-paragraph,LaTeX-backward-paragraph)
    (LaTeX-narrow-to-environment): Use _ for unused dotimes counter variable.
    (LaTeX-check-insert-macro-default-style): Use TeX-last-optional-rejected
    instead of last-optional-rejected.
    * context.el: Enable lexical-binding.
    
(ConTeXt-title,ConTeXt-name,ConTeXt-level,ConTeXt-done-mark,ConTeXt-reference):
    New defvars.
    (ConTeXt-section): Bind them.
    (ConTeXt-numbered-section-hook): Adapt docstring to the new defvars.
    (ConTeXt-unnumbered-section-hook): Ditto.
    (ConTeXt-numbered-section-heading,ConTeXt-unnumbered-section-heading)
    (ConTeXt-section-section,ConTeXt-section-ref): Use the new defvars.
    * preview.el.in (preview-generate-preview): Remove region-p argument.
    (preview-start-dvipng,preview-start-dvips)
    (preview-cache-preamble): Adapt to TeX-command-expand and
    preview-generate-preview signature change.
    (preview-region, preview-document): Ditto.
    * style/bicaption.el (LaTeX-arg-bicaption-bicaption): Use
    TeX-last-optional-rejected instead of last-optional-rejected.
    * style/booktabs.el ("booktabs"): Menion TeX-last-optional-rejected in 
comment.
    * style/caption.el (LaTeX-arg-caption-captionbox): Use
    TeX-last-optional-rejected instead of last-optional-rejected.
    * style/color.el (TeX-arg-color,(TeX-arg-color-fcolorbox): Use
    TeX-last-optional-rejected instead of last-optional-rejected.
    * style/exam.el: Enable lexical-binding.
    (LaTeX-exam-insert-item): Use LaTeX-current-environment instead of 
dynamically
    bound `environment'.
    * style/floatrow.el (LaTeX-floatrow-arg-floatbox): Use
    TeX-last-optional-rejected instead of last-optional-rejected.
    * style/ifluatex.el (LaTeX-ifluatex-set-TeX-exit-mark): Use TeX-exit-mark
    instead of exit-mark.
    * style/xcolor.el 
(TeX-arg-xcolor-definecolor,TeX-arg-xcolor-definecolorset):
    (TeX-arg-xcolor,TeX-arg-xcolor-fcolorbox): Use TeX-last-optional-rejected
    instead of last-optional-rejected.
    * tests/japanese/preview-latex.el (japanese-preview-preserve-kanji-option2)
    (japanese-preview-preserve-kanji-option3): Adapt to TeX-command-expand
    signature change.
    * tests/tex/command-expansion.el (TeX-command-expansion)
    (TeX-command-expansion-errors,TeX-command-detokenize)
    (TeX-command-expand-skip-file-name,TeX-command-expand-active-master): Adapt 
to
    TeX-command-expand signature change.
    * doc/auctex.texi (Sectioning): Describe LaTeX-level, LaTeX-name, 
LaTeX-title,
    LaTeX-toc, and LaTeX-done-mark instead of the former unprefixed vars.

diff --git a/context.el b/context.el
index 626da22..a2e9314 100644
--- a/context.el
+++ b/context.el
@@ -1,4 +1,4 @@
-;;; context.el --- Support for ConTeXt documents.
+;;; context.el --- Support for ConTeXt documents.  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2003-2006, 2008, 2010, 2012, 2014-2020
 ;;   Free Software Foundation, Inc.
@@ -64,24 +64,6 @@
   :group 'ConTeXt
   :group 'TeX-macro)
 
-
-;;; variables
-
-;; Dynamically scoped vars used in certain macro's.
-;; BEWARE: We used to give them a global nil value, but this can mess up poor
-;; unrelated packages using those same vars but expecting them to be
-;; lexically scoped.
-;; So don't give them a global value, which makes sure the effect of `defvar'
-;; localized to this file!
-;; N.B.: These forms are commented out since they produce a "lack of
-;; prefix" warning during byte-compilation.  This way they produce
-;; only a "reference to free variable" one.
-;; (defvar done-mark) ; Position of point afterwards, default nil (meaning end)
-;; (defvar reference) ; Used by `ConTeXt-section-ref' and 
`ConTeXt-section-section'.
-;; (defvar title) ; Used by `ConTeXt-section-title' and 
`ConTeXt-section-section'.
-;; (defvar name)
-;; (defvar level)
-
 ;; others
 
 (defvar ConTeXt-known-interfaces '("cz" "de" "en" "it" "nl" "ro" "uk"))
@@ -271,6 +253,13 @@
 
 ;;; Sections
 
+;; Declare dynamically scoped vars.
+(defvar ConTeXt-title nil "Dynamically bound by `ConTeXt-section'.")
+(defvar ConTeXt-name nil "Dynamically bound by `ConTeXt-section'.")
+(defvar ConTeXt-level nil "Dynamically bound by `ConTeXt-section'.")
+(defvar ConTeXt-done-mark nil "Dynamically bound by `ConTeXt-section'.")
+(defvar ConTeXt-reference nil "Dynamically bound by `ConTeXt-section'.")
+
 (defun ConTeXt-section (arg)
   "Insert a template for a ConTeXt section.
 Determinate the type of section to be inserted, by the argument ARG.
@@ -301,23 +290,23 @@ The following variables can be set to customize:
 
   (interactive "*P")
   (let* ((val (prefix-numeric-value arg))
-        (level (cond ((null arg)
-                      (ConTeXt-current-section))
-                     ((listp arg)
-                      (ConTeXt-down-section))
-                     ((< val 0)
-                      (ConTeXt-up-section (- val)))
-                     (t val)))
-        (name (ConTeXt-numbered-section-name level))
-        (title "")
-         (reference nil)
-        (done-mark (make-marker)))
+        (ConTeXt-level (cond ((null arg)
+                              (ConTeXt-current-section))
+                             ((listp arg)
+                              (ConTeXt-down-section))
+                             ((< val 0)
+                              (ConTeXt-up-section (- val)))
+                             (t val)))
+        (ConTeXt-name (ConTeXt-numbered-section-name ConTeXt-level))
+        (ConTeXt-title "")
+         (ConTeXt-reference nil)
+        (ConTeXt-done-mark (make-marker)))
     (newline)
     (run-hooks 'ConTeXt-numbered-section-hook)
     (newline)
-    (if (marker-position done-mark)
-       (goto-char (marker-position done-mark)))
-    (set-marker done-mark nil)))
+    (if (marker-position ConTeXt-done-mark)
+       (goto-char (marker-position ConTeXt-done-mark)))
+    (set-marker ConTeXt-done-mark nil)))
 
 ;; LaTeX has a max function here, which makes no sense.
 ;; I think you want to insert a section that is max ConTeXt-largest-level
@@ -417,22 +406,24 @@ section."
 
 The following variables are set before the hooks are run
 
-`level' - numeric section level, see the documentation of `ConTeXt-section'.
-`name' - name of the sectioning command, derived from `level'.
-`title' - The title of the section, default to an empty string.
-`done-mark' - Position of point afterwards, default nil (meaning end).
+`ConTeXt-level' - numeric section level, see the documentation of 
`ConTeXt-section'.
+`ConTeXt-name' - name of the sectioning command, derived from `level'.
+`ConTeXt-title' - The title of the section, default to an empty string.
+`ConTeXt-done-mark' - Position of point afterwards, default nil (meaning end).
 
 The following standard hook exist -
 
-ConTeXt-section-heading: Query the user about the name of the
-sectioning command.  Modifies `level' and `name'.
+ConTeXt-numbered-section-heading: Query the user about the name
+of the sectioning command.  Modifies `ConTeXt-level' and
+`ConTeXt-name'.
 
 ConTeXt-section-title: Query the user about the title of the
-section.  Modifies `title'.
+section.  Modifies `ConTeXt-title'.
 
-ConTeXt-section-section: Insert ConTeXt section command according to
-`name', `title', and `reference'.  If `title' is an empty string,
-`done-mark' will be placed at the point they should be inserted.
+ConTeXt-section-section: Insert ConTeXt section command according
+to `ConTeXt-name', `ConTeXt-title', and `LaTeX-reference'.  If
+`ConTeXt-title' is an empty string, `ConTeXt-done-mark' will be
+placed at the point they should be inserted.
 
 ConTeXt-section-ref: Insert a reference for this section command.
 
@@ -463,22 +454,24 @@ in your .emacs file."
 
 The following variables are set before the hooks are run
 
-`level' - numeric section level, see the documentation of `ConTeXt-section'.
-`name' - name of the sectioning command, derived from `level'.
-`title' - The title of the section, default to an empty string.
-`done-mark' - Position of point afterwards, default nil (meaning end).
+`ConTeXt-level' - numeric section level, see the documentation of 
`ConTeXt-section'.
+`ConTeXt-name' - name of the sectioning command, derived from `ConTeXt-level'.
+`ConTeXt-title' - The title of the section, default to an empty string.
+`ConTeXt-done-mark' - Position of point afterwards, default nil (meaning end).
 
 The following standard hook exist -
 
-ConTeXt-section-heading: Query the user about the name of the
-sectioning command.  Modifies `level' and `name'.
+ConTeXt-unnumbered-section-heading: Query the user about the name
+of the sectioning command.  Modifies `ConTeXt-level' and
+`ConTeXt-name'.
 
 ConTeXt-section-title: Query the user about the title of the
-section.  Modifies `title'.
+section.  Modifies `ConTeXt-title'.
 
-ConTeXt-section-section: Insert ConTeXt section command according to
-`name', `title', and `reference'.  If `title' is an empty string,
-`done-mark' will be placed at the point they should be inserted.
+ConTeXt-section-section: Insert ConTeXt section command according
+to `ConTeXt-name', `ConTeXt-title', and `LaTeX-reference'.  If
+`ConTeXt-title' is an empty string, `ConTeXt-done-mark' will be
+placed at the point they should be inserted.
 
 ConTeXt-section-ref: Insert a reference for this section command.
 
@@ -512,48 +505,49 @@ in your .emacs file."
 Insert this hook into `ConTeXt-numbered-section-hook' to allow the user to 
change
 the name of the sectioning command inserted with `\\[ConTeXt-section]'."
   (let ((string (completing-read
-                (concat "Select level (default " name "): ")
+                (concat "Select level (default " ConTeXt-name "): ")
                 ConTeXt-numbered-section-list
                 nil nil nil)))
     ;; Update name
     (if (not (zerop (length string)))
-       (setq name string))))
+       (setq ConTeXt-name string))))
 
 (defun ConTeXt-unnumbered-section-heading ()
   "Hook to prompt for ConTeXt section name.
 Insert this hook into `ConTeXt-unnumbered-section-hook' to allow the user to 
change
 the name of the sectioning command inserted with `\\[ConTeXt-section]'."
   (let ((string (completing-read
-                (concat "Select level (default " name "): ")
+                (concat "Select level (default " ConTeXt-name "): ")
                 ConTeXt-unnumbered-section-list
                 nil nil nil)))
     ;; Update name
     (if (not (zerop (length string)))
-       (setq name string))))
+       (setq ConTeXt-name string))))
 
 (defun ConTeXt-section-title ()
   "Hook to prompt for ConTeXt section title.
 Insert this hook into `ConTeXt-(un)numbered-section-hook' to allow the user to 
change
 the title of the section inserted with `\\[ConTeXt-section]."
-  (setq title (TeX-read-string "What title: ")))
+  (setq ConTeXt-title (TeX-read-string "What title: ")))
 
 (defun ConTeXt-section-section ()
   "Hook to insert ConTeXt section command into the file.
-Insert this hook into `ConTeXt-section-hook' after those hooks which sets
-the `name', `title', and `reference' variables, but before those hooks which
+Insert this hook into `ConTeXt-section-hook' after those hooks
+which sets the `ConTeXt-name', `ConTeXt-title', and
+`ConTeXt-reference' variables, but before those hooks which
 assumes the section already is inserted."
-  (insert TeX-esc name)
-  (cond ((null reference))
-       ((zerop (length reference))
+  (insert TeX-esc ConTeXt-name)
+  (cond ((null ConTeXt-reference))
+       ((zerop (length ConTeXt-reference))
         (insert ConTeXt-optop)
-        (set-marker done-mark (point))
+        (set-marker ConTeXt-done-mark (point))
         (insert ConTeXt-optcl))
        (t
-        (insert ConTeXt-optop reference ConTeXt-optcl)))
+        (insert ConTeXt-optop ConTeXt-reference ConTeXt-optcl)))
   (insert TeX-grop)
-  (if (zerop (length title))
-      (set-marker done-mark (point)))
-  (insert title TeX-grcl)
+  (if (zerop (length ConTeXt-title))
+      (set-marker ConTeXt-done-mark (point)))
+  (insert ConTeXt-title TeX-grcl)
   (newline)
   ;; If RefTeX is available, tell it that we've just made a new section
   (and (fboundp 'reftex-notice-new-section)
@@ -563,13 +557,14 @@ assumes the section already is inserted."
   "Hook to insert a reference after the sectioning command.
 Insert this hook into `ConTeXt-section-hook' to prompt for a label to be
 inserted after the sectioning command."
-  (setq reference (completing-read
-                  (TeX-argument-prompt t nil
-                                       "Comma separated list of references")
-                  (LaTeX-label-list) nil nil))
+  (setq ConTeXt-reference
+        (completing-read
+        (TeX-argument-prompt t nil
+                             "Comma separated list of references")
+        (LaTeX-label-list) nil nil))
   ;; No reference or empty string entered?
-  (if (string-equal "" reference)
-      (setq reference nil)))
+  (if (string-equal "" ConTeXt-reference)
+      (setq ConTeXt-reference nil)))
 
 
 ;; Various
@@ -1147,7 +1142,8 @@ An optional fourth (or sixth) element means always 
replace if t."
 (defun ConTeXt-imenu-create-index-function ()
   "Imenu support function for ConTeXt."
   (TeX-update-style)
-  (let (entries level (regexp (ConTeXt-outline-regexp)))
+  (let (entries
+        (regexp (ConTeXt-outline-regexp)))
     (goto-char (point-max))
     (while (re-search-backward regexp nil t)
       (let* ((name (ConTeXt-outline-name))
diff --git a/doc/auctex.texi b/doc/auctex.texi
index b19b60d..1fd92e8 100644
--- a/doc/auctex.texi
+++ b/doc/auctex.texi
@@ -770,16 +770,16 @@ List of hooks to run when a new section is inserted.
 The following variables are set before the hooks are run
 
 @table @var
-@item level
+@item LaTeX-level
 Numeric section level, default set by prefix arg to
 @code{LaTeX-section}.
-@item name
+@item LaTeX-name
 Name of the sectioning command, derived from @var{level}.
-@item title
+@item LaTeX-title
 The title of the section, default to an empty string.
-@item toc
+@item LaTeX-toc
 Entry for the table of contents list, default nil.
-@item done-mark
+@item LaTeX-done-mark
 Position of point afterwards, default nil meaning after the inserted
 text.
 @end table
@@ -790,16 +790,17 @@ get the desired functionality by choosing from these 
hooks.
 @ftable @code
 @item LaTeX-section-heading
 Query the user about the name of the sectioning command.  Modifies
-@var{level} and @var{name}.
+@var{LaTeX-level} and @var{LaTeX-name}.
 @item LaTeX-section-title
-Query the user about the title of the section. Modifies @var{title}.
+Query the user about the title of the section. Modifies @var{LaTeX-title}.
 @item LaTeX-section-toc
-Query the user for the toc entry.  Modifies @var{toc}.
+Query the user for the toc entry.  Modifies @var{LaTeX-toc}.
 @item LaTeX-section-section
-Insert @LaTeX{} section command according to @var{name}, @var{title},
-and @var{toc}.  If @var{toc} is nil, no toc entry is inserted.  If
-@var{toc} or @var{title} are empty strings, @var{done-mark} will be
-placed at the point they should be inserted.
+Insert @LaTeX{} section command according to @var{LaTeX-name},
+@var{LaTeX-title}, and @var{LaTeX-toc}.  If @var{LaTeX-toc} is nil, no
+toc entry is inserted.  If @var{LaTeX-toc} or @var{LaTeX-title} are
+empty strings, @var{LaTeX-done-mark} will be placed at the point they
+should be inserted.
 @item LaTeX-section-label
 Insert a label after the section command.  Controlled by the variable
 @code{LaTeX-section-label}.
@@ -5354,8 +5355,8 @@ If you add new hooks, you can assume that point is placed 
directly after
 the previous argument, or after the macro name if this is the first
 argument.  Please leave point located after the argument you are
 inserting.  If you want point to be located somewhere else after all
-hooks have been processed, set the value of @code{exit-mark}.  It will
-point nowhere, until the argument hook sets it.
+hooks have been processed, set the value of @code{TeX-exit-mark}.  It
+will point nowhere, until the argument hook sets it.
 
 Some packages provide macros that are rarely useful to non-expert users.
 Those should be marked as expert macros using
diff --git a/latex.el b/latex.el
index 923d27a..2dc00ba 100644
--- a/latex.el
+++ b/latex.el
@@ -1,4 +1,4 @@
-;;; latex.el --- Support for LaTeX documents.
+;;; latex.el --- Support for LaTeX documents.  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 1991, 1993-2020 Free Software Foundation, Inc.
 
@@ -127,14 +127,11 @@ This depends on `LaTeX-insert-into-comments'."
 ;;; Sections
 
 ;; Declare dynamically scoped vars.
-;; N.B.: These forms are commented out since they produce a "lack of
-;; prefix" warning during byte-compilation.  This way they produce
-;; only a "reference to free variable" one.
-;; (defvar title)
-;; (defvar name)
-;; (defvar level)
-;; (defvar done-mark)
-;; (defvar toc)
+(defvar LaTeX-title nil "Dynamically bound by `LaTeX-section'.")
+(defvar LaTeX-name nil "Dynamically bound by `LaTeX-section'.")
+(defvar LaTeX-level nil "Dynamically bound by `LaTeX-section'.")
+(defvar LaTeX-done-mark nil "Dynamically bound by `LaTeX-section'.")
+(defvar LaTeX-toc nil "Dynamically bound by `LaTeX-section'.")
 
 (defun LaTeX-section (arg)
   "Insert a template for a LaTeX section.
@@ -160,25 +157,25 @@ The following variables can be set to customize:
 
   (interactive "*P")
   (let* ((val (prefix-numeric-value arg))
-        (level (cond ((null arg)
-                      (LaTeX-current-section))
-                     ((listp arg)
-                      (LaTeX-down-section))
-                     ((< val 0)
-                      (LaTeX-up-section (- val)))
-                     (t val)))
-        (name (LaTeX-section-name level))
-        (toc nil)
-        (title (if (TeX-active-mark)
-                   (buffer-substring (region-beginning)
-                                     (region-end))
-                 ""))
-        (done-mark (make-marker)))
+        (LaTeX-level (cond ((null arg)
+                            (LaTeX-current-section))
+                           ((listp arg)
+                            (LaTeX-down-section))
+                           ((< val 0)
+                            (LaTeX-up-section (- val)))
+                           (t val)))
+        (LaTeX-name (LaTeX-section-name LaTeX-level))
+        (LaTeX-toc nil)
+        (LaTeX-title (if (TeX-active-mark)
+                         (buffer-substring (region-beginning)
+                                           (region-end))
+                       ""))
+        (LaTeX-done-mark (make-marker)))
     (run-hooks 'LaTeX-section-hook)
     (LaTeX-newline)
-    (if (marker-position done-mark)
-       (goto-char (marker-position done-mark)))
-    (set-marker done-mark nil)))
+    (if (marker-position LaTeX-done-mark)
+       (goto-char (marker-position LaTeX-done-mark)))
+    (set-marker LaTeX-done-mark nil)))
 
 (defun LaTeX-current-section ()
   "Return the level of the section that contain point.
@@ -371,34 +368,35 @@ If so, return the second element, otherwise return nil."
 (defcustom LaTeX-section-hook
   '(LaTeX-section-heading
     LaTeX-section-title
-;; LaTeX-section-toc           ; Most people won't want this
+    ;; LaTeX-section-toc               ; Most people won't want this
     LaTeX-section-section
     LaTeX-section-label)
   "List of hooks to run when a new section is inserted.
 
 The following variables are set before the hooks are run
 
-level - numeric section level, see the documentation of `LaTeX-section'.
-name - name of the sectioning command, derived from `level'.
-title - The title of the section, default to an empty string.
-toc - Entry for the table of contents list, default nil.
-done-mark - Position of point afterwards, default nil (meaning end).
+LaTeX-level - numeric section level, see the documentation of `LaTeX-section'.
+LaTeX-name - name of the sectioning command, derived from `LaTeX-level'.
+LaTeX-title - The title of the section, default to an empty string.
+LaTeX-toc - Entry for the table of contents list, default nil.
+LaTeX-done-mark - Position of point afterwards, default nil (meaning end).
 
 The following standard hook exist -
 
 LaTeX-section-heading: Query the user about the name of the
-sectioning command.  Modifies `level' and `name'.
+sectioning command.  Modifies `LaTeX-level' and `LaTeX-name'.
 
 LaTeX-section-title: Query the user about the title of the
-section.  Modifies `title'.
+section.  Modifies `LaTeX-title'.
 
 LaTeX-section-toc: Query the user for the toc entry.  Modifies
-`toc'.
+`LaTeX-toc'.
 
 LaTeX-section-section: Insert LaTeX section command according to
-`name', `title', and `toc'.  If `toc' is nil, no toc entry is
-inserted.  If `toc' or `title' are empty strings, `done-mark' will be
-placed at the point they should be inserted.
+`LaTeX-name', `LaTeX-title', and `LaTeX-toc'.  If `LaTeX-toc' is
+nil, no toc entry is inserted.  If `LaTeX-toc' or `LaTeX-title'
+are empty strings, `LaTeX-done-mark' will be placed at the point
+they should be inserted.
 
 LaTeX-section-label: Insert a label after the section command.
 Controled by the variable `LaTeX-section-label'.
@@ -458,20 +456,20 @@ no label is inserted."
 Insert this hook into `LaTeX-section-hook' to allow the user to change
 the name of the sectioning command inserted with `\\[LaTeX-section]'."
   (let ((string (completing-read
-                (concat "Level (default " name "): ")
+                (concat "Level (default " LaTeX-name "): ")
                 LaTeX-section-list
-                nil nil nil nil name)))
-    ;; Update name
+                nil nil nil nil LaTeX-name)))
+    ;; Update LaTeX-name
     (if (not (zerop (length string)))
-       (setq name string))
+       (setq LaTeX-name string))
     ;; Update level
-    (setq level (LaTeX-section-level name))))
+    (setq LaTeX-level (LaTeX-section-level LaTeX-name))))
 
 (defun LaTeX-section-title ()
   "Hook to prompt for LaTeX section title.
 Insert this hook into `LaTeX-section-hook' to allow the user to change
 the title of the section inserted with `\\[LaTeX-section]."
-  (setq title (TeX-read-string "Title: " title))
+  (setq LaTeX-title (TeX-read-string "Title: " LaTeX-title))
   (let ((region (and (TeX-active-mark)
                     (cons (region-beginning) (region-end)))))
     (when region (delete-region (car region) (cdr region)))))
@@ -480,15 +478,16 @@ the title of the section inserted with 
`\\[LaTeX-section]."
   "Hook to prompt for the LaTeX section entry in the table of content .
 Insert this hook into `LaTeX-section-hook' to allow the user to insert
 a different entry for the section in the table of content."
-  (setq toc (TeX-read-string "Toc Entry: "))
-  (if (zerop (length toc))
-      (setq toc nil)))
+  (setq LaTeX-toc (TeX-read-string "Toc Entry: "))
+  (if (zerop (length LaTeX-toc))
+      (setq LaTeX-toc nil)))
 
 (defun LaTeX-section-section ()
   "Hook to insert LaTeX section command into the file.
-Insert this hook into `LaTeX-section-hook' after those hooks that set
-the `name', `title', and `toc' variables, but before those hooks that
-assume that the section is already inserted."
+Insert this hook into `LaTeX-section-hook' after those hooks that
+set the `LaTeX-name', `LaTeX-title', and `LaTeX-toc' variables,
+but before those hooks that assume that the section is already
+inserted."
   ;; insert a new line if the current line and the previous line are
   ;; not empty (except for whitespace), with one exception: do not
   ;; insert a new line if the previous (or current, sigh) line starts
@@ -499,18 +498,18 @@ assume that the section is already inserted."
                     "begin")
             (line-beginning-position 0) t))
     (LaTeX-newline))
-  (insert TeX-esc name)
-  (cond ((null toc))
-       ((zerop (length toc))
+  (insert TeX-esc LaTeX-name)
+  (cond ((null LaTeX-toc))
+       ((zerop (length LaTeX-toc))
         (insert LaTeX-optop)
-        (set-marker done-mark (point))
+        (set-marker LaTeX-done-mark (point))
         (insert LaTeX-optcl))
        (t
-        (insert LaTeX-optop toc LaTeX-optcl)))
+        (insert LaTeX-optop LaTeX-toc LaTeX-optcl)))
   (insert TeX-grop)
-  (if (zerop (length title))
-      (set-marker done-mark (point)))
-  (insert title TeX-grcl)
+  (if (zerop (length LaTeX-title))
+      (set-marker LaTeX-done-mark (point)))
+  (insert LaTeX-title TeX-grcl)
   (LaTeX-newline)
   ;; If RefTeX is available, tell it that we've just made a new section
   (and (fboundp 'reftex-notice-new-section)
@@ -522,7 +521,7 @@ Insert this hook into `LaTeX-section-hook' to prompt for a 
label to be
 inserted after the sectioning command.
 
 The behaviour of this hook is controlled by variable `LaTeX-section-label'."
-  (and (LaTeX-label name 'section)
+  (and (LaTeX-label LaTeX-name 'section)
        (LaTeX-newline)))
 
 ;;; Environments
@@ -1317,9 +1316,9 @@ Just like array and tabular."
   (save-excursion
     (LaTeX-find-matching-begin)
     (end-of-line)
-    (let ((exit-mark (if (boundp 'exit-mark)
-                        exit-mark
-                      (make-marker))))
+    (let ((TeX-exit-mark (if (boundp 'TeX-exit-mark)
+                            TeX-exit-mark
+                          (make-marker))))
       (TeX-parse-arguments args))))
 
 (defun LaTeX-env-label-as-keyval (_optional &optional keyword keyvals 
environment)
@@ -2055,7 +2054,7 @@ string.  ARGS is unused."
   (TeX-argument-insert
    (TeX-read-string (TeX-argument-prompt optional prompt "Index tag")) 
optional))
 
-(defun TeX-arg-index (optional &optional prompt &rest args)
+(defun TeX-arg-index (optional &optional prompt &rest _args)
   "Prompt for an index entry completing with known entries.
 If OPTIONAL is non-nil, insert the resulting value as an optional
 argument, otherwise as a mandatory one.  Use PROMPT as the prompt
@@ -2099,7 +2098,7 @@ the list of defined environments."
     (TeX-argument-insert environment optional)))
 
 ;; Why is DEFINITION unused?
-(defun TeX-arg-cite (optional &optional prompt definition)
+(defun TeX-arg-cite (optional &optional prompt _definition)
   "Prompt for a BibTeX citation with completion.
 If OPTIONAL is non-nil, insert the resulting value as an optional
 argument, otherwise as a mandatory one.  Use PROMPT as the prompt
@@ -4479,10 +4478,10 @@ environments."
     ;; Only change point and mark after beginning and end were found.
     ;; Point should not end up in the middle of nowhere if the search fails.
     (save-excursion
-      (dotimes (c count) (LaTeX-find-matching-end))
+      (dotimes (_ count) (LaTeX-find-matching-end))
       (setq end (line-beginning-position 2))
       (goto-char cur)
-      (dotimes (c count) (LaTeX-find-matching-begin))
+      (dotimes (_ count) (LaTeX-find-matching-begin))
       (setq beg (point)))
     (push-mark end)
     (goto-char beg)
@@ -4615,7 +4614,7 @@ convenience function which can be used in style files."
   "Move forward to end of paragraph.
 If COUNT is non-nil, do it COUNT times."
   (or count (setq count 1))
-  (dotimes (i count)
+  (dotimes (_ count)
     (let* ((macro-start (TeX-find-macro-start))
           (paragraph-command-start
            (cond
@@ -4668,7 +4667,7 @@ If COUNT is non-nil, do it COUNT times."
   "Move backward to beginning of paragraph.
 If COUNT is non-nil, do it COUNT times."
   (or count (setq count 1))
-  (dotimes (i count)
+  (dotimes (_ count)
     (let* ((macro-start (TeX-find-macro-start)))
       (if (and macro-start
               ;; Point really has to be inside of the macro, not before it.
@@ -5557,10 +5556,10 @@ environments."
     (widen)
     (let ((opoint (point))
          beg end)
-      (dotimes (c count) (LaTeX-find-matching-end))
+      (dotimes (_ count) (LaTeX-find-matching-end))
       (setq end (point))
       (goto-char opoint)
-      (dotimes (c count) (LaTeX-find-matching-begin))
+      (dotimes (_ count) (LaTeX-find-matching-begin))
       (setq beg (point))
       (narrow-to-region beg end))))
 (put 'LaTeX-narrow-to-environment 'disabled t)
@@ -6794,7 +6793,7 @@ function would return non-nil and `(match-string 1)' 
would return
 (defun LaTeX-imenu-create-index-function ()
   "Imenu support function for LaTeX."
   (TeX-update-style)
-  (let (entries level
+  (let (entries
        (regexp (LaTeX-outline-regexp)))
     (goto-char (point-max))
     (while (re-search-backward regexp nil t)
@@ -6930,7 +6929,7 @@ functions `TeX-arg-color' (style/color.el) or
                   (equal current-prefix-arg '(4)))
              (and (eq TeX-insert-macro-default-style 'mandatory-args-only)
                   (null (equal current-prefix-arg '(4))))
-             last-optional-rejected))
+             TeX-last-optional-rejected))
      ,@body))
 
 (defun LaTeX-extract-key-value-label (&optional key num)
diff --git a/preview.el.in b/preview.el.in
index c14e490..f1cbb18 100644
--- a/preview.el.in
+++ b/preview.el.in
@@ -945,9 +945,9 @@ Pure borderless black-on-white will return an empty string."
           (funcall (car gsfile) "dvi" t))))
     (file-error nil))
   (when preview-ps-file
-      (condition-case nil
-         (preview-delete-file preview-ps-file)
-       (file-error nil)))
+    (condition-case nil
+       (preview-delete-file preview-ps-file)
+      (file-error nil)))
   (setq TeX-sentinel-function nil))
 
 (defalias 'preview-dvipng-abort 'preview-dvips-abort)
@@ -3671,8 +3671,7 @@ The fourth value is the transparent border thickness."
         (colors (preview-dvipng-color-string preview-colors res))
         (command (with-current-buffer TeX-command-buffer
                    (prog1
-                       (concat (TeX-command-expand preview-dvipng-command
-                                                   (car file))
+                       (concat (TeX-command-expand preview-dvipng-command)
                                " " colors resolution)
                      (setq tempdir TeX-active-tempdir))))
         (name "Preview-DviPNG"))
@@ -3710,8 +3709,7 @@ If FAST is set, do a fast conversion."
                    (prog1
                        (TeX-command-expand (if fast
                                                preview-fast-dvips-command
-                                             preview-dvips-command)
-                                           (car file))
+                                             preview-dvips-command))
                      (setq tempdir TeX-active-tempdir))))
         (name "Preview-DviPS"))
     (setq TeX-active-tempdir tempdir)
@@ -3751,8 +3749,7 @@ If FAST is set, do a fast conversion."
         pdfsource
         (command (with-current-buffer TeX-command-buffer
                    (prog1
-                       (TeX-command-expand preview-pdf2dsc-command
-                                           (car file))
+                       (TeX-command-expand preview-pdf2dsc-command)
                      (setq tempdir TeX-active-tempdir
                            pdfsource (funcall (car file) "pdf" t)))))
         (name "Preview-PDF2DSC"))
@@ -3930,8 +3927,7 @@ If FORMAT-CONS is non-nil, a previous format may get 
reused."
         (master-file (expand-file-name (TeX-master-file t)))
         (command (preview-do-replacements
                   (TeX-command-expand
-                   (preview-string-expand preview-LaTeX-command)
-                   'TeX-master-file)
+                   (preview-string-expand preview-LaTeX-command))
                   preview-dump-replacements))
         (preview-auto-cache-preamble nil))
     (unless (and (consp (cdr format-cons))
@@ -3952,10 +3948,8 @@ If FORMAT-CONS is non-nil, a previous format may get 
reused."
 \\def\\AUCTEXINPUT##1{\\catcode`/ 12\\relax\\catcode`\\ 
9\\relax\\input\\detokenize{##1}\\relax}%
 \\let\\dump\\PREVIEWdump\\dump}\\input mylatex.ltx \\relax%\n" nil dump-file)
       (TeX-save-document master)
-      (prog1
-         (preview-generate-preview
-          nil master
-          command)
+      (setq TeX-current-process-region-p nil)
+      (prog1 (preview-generate-preview master command)
        (add-hook 'kill-emacs-hook #'preview-cleanout-tempfiles t)
        (setq TeX-sentinel-function
              `(lambda (process string)
@@ -4003,11 +3997,11 @@ stored in `preview-dumped-alist'."
                            (save-excursion
                              (goto-char begin)
                              (if (bolp) 0 -1))))))
-  (preview-generate-preview t (TeX-region-file)
+  (setq TeX-current-process-region-p t)
+  (preview-generate-preview (TeX-region-file)
                            (preview-do-replacements
                             (TeX-command-expand
-                             (preview-string-expand preview-LaTeX-command)
-                             'TeX-region-file)
+                             (preview-string-expand preview-LaTeX-command))
                             preview-LaTeX-command-replacements)))
 
 (defun preview-buffer ()
@@ -4042,12 +4036,12 @@ stored in `preview-dumped-alist'."
   "Run preview on master document."
   (interactive)
   (TeX-save-document (TeX-master-file))
+  (setq TeX-current-process-region-p nil)
   (preview-generate-preview
-   nil (TeX-master-file)
+   (TeX-master-file)
    (preview-do-replacements
     (TeX-command-expand
-     (preview-string-expand preview-LaTeX-command)
-     'TeX-master-file)
+     (preview-string-expand preview-LaTeX-command))
     preview-LaTeX-command-replacements)))
 
 (defun preview-environment (count)
@@ -4080,19 +4074,16 @@ environments is selected."
     (preview-region (region-beginning) (region-end))))
 
 
-(defun preview-generate-preview (region-p file command)
+(defun preview-generate-preview (file command)
   "Generate a preview.
-REGION-P is the region flag, FILE the file (without default
-extension), COMMAND is the command to use.
+FILE the file (without default extension), COMMAND is the command
+to use.
 
 It returns the started process."
-  (setq TeX-current-process-region-p region-p)
   (let* ((geometry (preview-get-geometry))
         (commandbuff (current-buffer))
         (pr-file (cons
-                  (if TeX-current-process-region-p
-                      'TeX-region-file
-                    'TeX-master-file)
+                  'TeX-active-master
                   (file-name-nondirectory file)))
         (master (TeX-master-file))
         (master-file (expand-file-name master))
diff --git a/style/bicaption.el b/style/bicaption.el
index 8622cd5..f29ccce 100644
--- a/style/bicaption.el
+++ b/style/bicaption.el
@@ -117,13 +117,13 @@ arguments."
     (when cap-box
       (let* ((TeX-arg-opening-brace "[")
             (TeX-arg-closing-brace "]")
-            (last-optional-rejected nil)
+            (TeX-last-optional-rejected nil)
             (width (LaTeX-check-insert-macro-default-style
                     (completing-read (TeX-argument-prompt t nil "Width")
                                      (mapcar (lambda (elt) (concat TeX-esc 
(car elt)))
                                              (LaTeX-length-list)))))
-            (last-optional-rejected (or (not width)
-                                        (and width (string= width ""))))
+            (TeX-last-optional-rejected (or (not width)
+                                            (and width (string= width ""))))
             (inpos (LaTeX-check-insert-macro-default-style
                     (if (and width (not (string-equal width "")))
                         (completing-read (TeX-argument-prompt t nil "Inner 
position")
diff --git a/style/booktabs.el b/style/booktabs.el
index 5a58b28..f4e60db 100644
--- a/style/booktabs.el
+++ b/style/booktabs.el
@@ -57,7 +57,7 @@ PROMPT is the value of the prompt to be shown."
     '("toprule" [ "Thickness" ])
     '("midrule" [ "Thickness" ])
     '("bottomrule" [ "Thickness" ])
-    ;; The `ignore' resets `last-optional-rejected' to nil so that the trim
+    ;; The `ignore' resets `TeX-last-optional-rejected' to nil so that the trim
     ;; argument is prompted also when the thickness is skipped.
     '("cmidrule" [ "Thickness" ] (ignore) [ LaTeX-booktabs-arg-paren "Trim" ]
       "Column(s)")
diff --git a/style/caption.el b/style/caption.el
index fb9ddbe..a5d325b 100644
--- a/style/caption.el
+++ b/style/caption.el
@@ -269,13 +269,13 @@ caption, insert only a caption."
     (insert TeX-grcl))
   (let* ((TeX-arg-opening-brace "[")
         (TeX-arg-closing-brace "]")
-        (last-optional-rejected nil)
+        (TeX-last-optional-rejected nil)
         (width (LaTeX-check-insert-macro-default-style
                 (completing-read (TeX-argument-prompt t nil "Width")
                                  (mapcar (lambda (elt) (concat TeX-esc (car 
elt)))
                                          (LaTeX-length-list)))))
-        (last-optional-rejected (or (not width)
-                                    (and width (string= width ""))))
+        (TeX-last-optional-rejected (or (not width)
+                                        (and width (string= width ""))))
         (inpos (LaTeX-check-insert-macro-default-style
                 (if (and width (not (string-equal width "")))
                     (completing-read (TeX-argument-prompt t nil "Inner 
position")
diff --git a/style/color.el b/style/color.el
index f8f850a..bfc91b4 100644
--- a/style/color.el
+++ b/style/color.el
@@ -131,7 +131,7 @@
   ;; `TeX-insert-macro-default-style' and if `current-prefix-arg'.
   ;; `named' is removed here from completion if package option is not
   ;; given.
-  (let* ((last-optional-rejected nil)
+  (let* ((TeX-last-optional-rejected nil)
          (model (LaTeX-check-insert-macro-default-style
                  (completing-read
                   (TeX-argument-prompt t prompt "Color model")
@@ -181,7 +181,7 @@
   ;; First, ask for <model> depending on
   ;; `TeX-insert-macro-default-style' and `current-prefix-arg'.
   ;; Remove `named' if necessary.
-  (let* ((last-optional-rejected nil)
+  (let* ((TeX-last-optional-rejected nil)
         (model (LaTeX-check-insert-macro-default-style
                  (completing-read
                   (TeX-argument-prompt t prompt "Color model")
diff --git a/style/exam.el b/style/exam.el
index 76bff4b..1dd7b2b 100644
--- a/style/exam.el
+++ b/style/exam.el
@@ -1,4 +1,4 @@
-;;; exam.el --- AUCTeX style for the (LaTeX) exam class
+;;; exam.el --- AUCTeX style for the (LaTeX) exam class  -*- lexical-binding: 
t; -*-
 
 ;; Copyright (C) 2016--2020 Free Software Foundation, Inc.
 
@@ -49,22 +49,23 @@
   (add-to-list 'LaTeX-exam-class-options opt))
 
 (defun LaTeX-exam-insert-item ()
-  "Insert a new item in an environment from exam class.
+  "Insert a new item in the current environment from exam class.
 Item inserted depends on the environment."
-  (TeX-insert-macro
-   (cond ((string= environment "questions")
-          "question")
-         ((string= environment "parts")
-          "part")
-         ((string= environment "subparts")
-          "subpart")
-         ((string= environment "subsubparts")
-          "subsubpart")
-        ((member environment '("choices" "oneparchoices"
-                               "checkboxes" "oneparcheckboxes"))
-         "choice")
-         ;; Fallback
-         (t "item"))))
+  (let ((env (LaTeX-current-environment)))
+    (TeX-insert-macro
+     (cond ((string= env "questions")
+            "question")
+           ((string= env "parts")
+            "part")
+           ((string= env "subparts")
+            "subpart")
+           ((string= env "subsubparts")
+            "subsubpart")
+          ((member env '("choices" "oneparchoices"
+                         "checkboxes" "oneparcheckboxes"))
+           "choice")
+           ;; Fallback
+           (t "item")))))
 
 (defun LaTeX-exam-insert-label (_optional &optional name type)
   "Indent the line and query/insert a label incl. the \"\\label\" macro.
diff --git a/style/floatrow.el b/style/floatrow.el
index 57f58c7..2411d67 100644
--- a/style/floatrow.el
+++ b/style/floatrow.el
@@ -349,21 +349,21 @@ If OPTIONAL is non-nil, indicate optional argument during 
query."
   ;; `TeX-argument-insert':
   (let* ((TeX-arg-opening-brace "[")
         (TeX-arg-closing-brace "]")
-        (last-optional-rejected nil)
+        (TeX-last-optional-rejected nil)
         (width (LaTeX-check-insert-macro-default-style
                 (completing-read
                  (TeX-argument-prompt t nil "Width")
                  (mapcar (lambda (x) (concat TeX-esc (car x)))
                          (LaTeX-length-list)))))
-        (last-optional-rejected (or (not width)
-                                    (and width (string= width ""))))
+        (TeX-last-optional-rejected (or (not width)
+                                        (and width (string= width ""))))
         (height (LaTeX-check-insert-macro-default-style
                  (completing-read
                   (TeX-argument-prompt t nil "Height")
                   (mapcar (lambda (x) (concat TeX-esc (car x)))
                           (LaTeX-length-list)))))
-        (last-optional-rejected (or (not height)
-                                    (and height (string= height ""))))
+        (TeX-last-optional-rejected (or (not height)
+                                        (and height (string= height ""))))
         (vertpos (LaTeX-check-insert-macro-default-style
                   (if (string= height "")
                       ""
diff --git a/style/ifluatex.el b/style/ifluatex.el
index 246bc22..46d59cd 100644
--- a/style/ifluatex.el
+++ b/style/ifluatex.el
@@ -34,35 +34,35 @@
                  "font-latex"
                  (keywords class))
 
-(defun LaTeX-ifluatex-set-exit-mark (_optional)
-  "Discard OPTIONAL and set exit-mark to current point."
-  (set-marker exit-mark (point)))
+(defun LaTeX-ifluatex-set-TeX-exit-mark (_optional)
+  "Discard OPTIONAL and set `TeX-exit-mark' to current point."
+  (set-marker TeX-exit-mark (point)))
 
 (TeX-add-style-hook
+ "ifluatex"
+ (lambda ()
+   (TeX-add-symbols
+    '("ifluatex"
+      (TeX-arg-literal "%\n")
+      LaTeX-ifluatex-set-TeX-exit-mark
+      (TeX-arg-literal "\n\\else%\n\\fi%"))
+    '("luatexversion" 0)
+    '("luatexrevision" 0))
+   (TeX-declare-expert-macros
     "ifluatex"
-  (lambda ()
-    (TeX-add-symbols
-     '("ifluatex"
-       (TeX-arg-literal "%\n")
-       LaTeX-ifluatex-set-exit-mark
-       (TeX-arg-literal "\n\\else%\n\\fi%"))
-     '("luatexversion" 0)
-     '("luatexrevision" 0))
-    (TeX-declare-expert-macros
-     "ifluatex"
-     "ifluatex" "luatexversion" "luatexrevision")
-
-    ;; This package is used to make it possible to compile a document with both
-    ;; LuaTeX and base TeX engines.  By setting `TeX-check-engine-list' to nil
-    ;; we ignore engine restrictions posed by other packages.
-    (setq TeX-check-engine-list nil)
-
-    (when (and (featurep 'font-latex)
-              (eq TeX-install-font-lock 'font-latex-setup))
-      (font-latex-add-keywords '(("luatexversion")
-                                ("luatexrevision"))
-                              'function)))
-  LaTeX-dialect)
+    "ifluatex" "luatexversion" "luatexrevision")
+
+   ;; This package is used to make it possible to compile a document with both
+   ;; LuaTeX and base TeX engines.  By setting `TeX-check-engine-list' to nil
+   ;; we ignore engine restrictions posed by other packages.
+   (setq TeX-check-engine-list nil)
+
+   (when (and (featurep 'font-latex)
+             (eq TeX-install-font-lock 'font-latex-setup))
+     (font-latex-add-keywords '(("luatexversion")
+                               ("luatexrevision"))
+                             'function)))
+ LaTeX-dialect)
 
 (defvar LaTeX-ifluatex-package-options nil
   "Package options for the ifluatex package.")
diff --git a/style/xcolor.el b/style/xcolor.el
index 43c5637..3d77b35 100644
--- a/style/xcolor.el
+++ b/style/xcolor.el
@@ -284,7 +284,7 @@ xcolor package.")
 (defun TeX-arg-xcolor-definecolor (optional)
   "Insert arguments of \\definecolor and similar macros from xcolor.sty."
   ;; \definecolor[<type>]{<name>}{<model-list>}{<spec-list>}
-  (let* ((last-optional-rejected nil)
+  (let* ((TeX-last-optional-rejected nil)
         (xcoltype  (LaTeX-check-insert-macro-default-style
                     (completing-read
                      (TeX-argument-prompt t nil "Type")
@@ -311,7 +311,7 @@ xcolor package.")
 
 (defun TeX-arg-xcolor-definecolorset (optional)
   "Insert arguments of \\definecolorset and similar macros from xcolor.sty."
-  (let* ((last-optional-rejected nil)
+  (let* ((TeX-last-optional-rejected nil)
         (xcoltype (LaTeX-check-insert-macro-default-style
                    (completing-read
                     (TeX-argument-prompt t nil "Type")
@@ -326,7 +326,7 @@ xcolor package.")
 (defun TeX-arg-xcolor (optional)
   "Insert arguments of various color commands from xcolor.sty."
   ;; \color{<name>} or \color[<model-list>]{<spec-list>}
-  (let* ((last-optional-rejected nil)
+  (let* ((TeX-last-optional-rejected nil)
         (xcolmodel (LaTeX-check-insert-macro-default-style
                     (completing-read
                      (TeX-argument-prompt t nil "Model (list)")
@@ -344,14 +344,14 @@ xcolor package.")
 (defun TeX-arg-xcolor-fcolorbox (optional)
   "Insert arguments of \\fcolorbox from xcolor.sty."
   ;;\fcolorbox[<frame model>]{<frame spec>}[<background model>]{<background 
spec>}{<text>}
-  (let* ((last-optional-rejected nil)
+  (let* ((TeX-last-optional-rejected nil)
         (xfrmodel (LaTeX-check-insert-macro-default-style
                    (completing-read
                     (TeX-argument-prompt t nil "(Frame) Color model")
                     LaTeX-xcolor-color-models)))
-        ;; Set `last-optional-rejected' acc. to `xfrmodel'
-        (last-optional-rejected (or (not xfrmodel)
-                                    (and xfrmodel (string= xfrmodel ""))))
+        ;; Set `TeX-last-optional-rejected' acc. to `xfrmodel'
+        (TeX-last-optional-rejected (or (not xfrmodel)
+                                        (and xfrmodel (string= xfrmodel ""))))
         (xfrspec  (if (or (null xfrmodel)
                           (string= xfrmodel "")
                           (string= xfrmodel "named"))
diff --git a/tests/japanese/preview-latex.el b/tests/japanese/preview-latex.el
index 41907df..5ca3d96 100644
--- a/tests/japanese/preview-latex.el
+++ b/tests/japanese/preview-latex.el
@@ -228,8 +228,7 @@ String encoded in `shift_jis' can have regexp meta 
characters in it."
          (setq process (TeX-inline-preview-internal
                         (preview-do-replacements
                          (TeX-command-expand
-                          (preview-string-expand preview-LaTeX-command)
-                          'TeX-master-file)
+                          (preview-string-expand preview-LaTeX-command))
                          preview-LaTeX-command-replacements)
                         dummyfile '(nil . nil) (current-buffer)
                         '(nil . (t . t)) dummyfile '(nil nil nil)))
@@ -263,8 +262,7 @@ String encoded in `shift_jis' can have regexp meta 
characters in it."
          (setq process (TeX-inline-preview-internal
                         (preview-do-replacements
                          (TeX-command-expand
-                          (preview-string-expand preview-LaTeX-command)
-                          'TeX-master-file)
+                          (preview-string-expand preview-LaTeX-command))
                          preview-dump-replacements)
                         dummyfile '(nil . nil) (current-buffer)
                         nil dummyfile '(nil nil nil)))
diff --git a/tests/tex/command-expansion.el b/tests/tex/command-expansion.el
index 0de5831..bb5c7d4 100644
--- a/tests/tex/command-expansion.el
+++ b/tests/tex/command-expansion.el
@@ -29,8 +29,7 @@
   (should (string=
            (let ((TeX-command-list
                  (list (cons "Test" '("%%%% %`%'" TeX-run-command t t)))))
-            (TeX-command-expand (nth 1 (assoc "Test" TeX-command-list))
-                                'TeX-master-file))
+            (TeX-command-expand (nth 1 (assoc "Test" TeX-command-list))))
            "%% ")))
 
 (ert-deftest TeX-command-expansion-errors ()
@@ -39,7 +38,7 @@
    ;; This error is actually thrown by `TeX-engine-in-engine-alist', but we 
want
    ;; to be sure that `TeX-command-expand' fails when the engine is not valid.
    (let ((TeX-engine 'non-existing-engine))
-     (TeX-command-expand "%l" 'TeX-master-file))))
+     (TeX-command-expand "%l"))))
 
 (ert-deftest TeX-view-command-raw-errors ()
   "Tests to trigger errors in `TeX-view-command-raw'."
@@ -94,7 +93,7 @@
                 (TeX-engine 'default)
                 (TeX-master "/tmp/abc")
                 (TeX-command-extra-options " \"\\foo\""))
-            (TeX-command-expand "%`%(extraopts)%' %T" #'TeX-master-file))
+            (TeX-command-expand "%`%(extraopts)%' %T"))
           " \"\\foo\" \"\\input\" \\\\detokenize\\{\\ abc.tex\\ \\}")))
 
 (ert-deftest TeX-command-expand-skip-file-name ()
@@ -108,24 +107,24 @@ See 
<https://lists.gnu.org/r/bug-auctex/2014-08/msg00012.html>."
   (let ((TeX-master "abc-def")
        (TeX-expand-list '(("-" (lambda () ":")))))
     (should (string=
-            (TeX-command-expand "%s" #'TeX-master-file)
+            (TeX-command-expand "%s")
             TeX-master))
     (should (string=
-            (TeX-command-expand "%t" #'TeX-master-file)
+            (TeX-command-expand "%t")
             (TeX-master-file "tex" t)))
     (should (string=
-            (TeX-command-expand "%T" #'TeX-master-file)
+            (TeX-command-expand "%T")
             (TeX-master-file "tex" t)))
     (should (string=
-            (TeX-command-expand "%d" #'TeX-master-file)
+            (TeX-command-expand "%d")
             (TeX-master-file "dvi" t)))
     (should (string=
-            (TeX-command-expand "%f" #'TeX-master-file)
+            (TeX-command-expand "%f")
             (TeX-master-file "ps" t)))
     ;; The expander of "%o" does not yet cater for this possible endless
     ;; loop.
     ;; (should (string=
-    ;;              (TeX-command-expand "%o" #'TeX-master-file)
+    ;;              (TeX-command-expand "%o")
     ;;              (TeX-master-file "pdf" t)))
     ))
 
@@ -138,11 +137,11 @@ See 
<https://lists.gnu.org/r/bug-auctex/2014-08/msg00012.html>."
        TeX-current-process-region-p)
     (setq TeX-current-process-region-p nil)
     (should (string=
-            (TeX-command-expand "%s" #'TeX-active-master)
+            (TeX-command-expand "%s")
             TeX-master))
     (setq TeX-current-process-region-p t)
     (should (string=
-            (TeX-command-expand "%s" #'TeX-active-master)
+            (TeX-command-expand "%s")
             TeX-region))))
 
 ;;; command-expansion.el ends here
diff --git a/tex-buf.el b/tex-buf.el
index 510722c..b9d9085 100644
--- a/tex-buf.el
+++ b/tex-buf.el
@@ -1,4 +1,4 @@
-;;; tex-buf.el --- External commands for AUCTeX.
+;;; tex-buf.el --- External commands for AUCTeX.  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 1991-1999, 2001-2020 Free Software Foundation, Inc.
 
@@ -463,10 +463,10 @@ Do you want to select one of these engines? "
   :group 'TeX-command
   :type 'integer)
 
-(defun TeX-command (name file &optional override-confirm)
-  "Run command NAME on the file returned by calling FILE.
+(defun TeX-command (name file-fn &optional override-confirm)
+  "Run command NAME on the file returned by calling FILE-FN.
 
-FILE is the symbol of a function returning a file name.  The
+FILE-FN is the symbol of a function returning a file name.  The
 function has one optional argument, the extension to use on the
 file.
 
@@ -485,17 +485,16 @@ been set."
   ;; because preview-latex calls `TeX-run-command' directly.
   (setq-default TeX-command-buffer (current-buffer))
 
-  (cond ((eq file #'TeX-region-file)
+  (cond ((eq file-fn #'TeX-region-file)
         (setq TeX-current-process-region-p t))
-       ((eq file #'TeX-master-file)
+       ((eq file-fn #'TeX-master-file)
         (setq TeX-current-process-region-p nil)))
 
   ;; When we're operating on a region, we need to update the position
   ;; of point in the region file so that forward search works.
   (if (string= name "View") (TeX-region-update-point))
 
-  (let ((command (TeX-command-expand (nth 1 (assoc name TeX-command-list))
-                                    file))
+  (let ((command (TeX-command-expand (nth 1 (assoc name TeX-command-list))))
        (hook (nth 2 (assoc name TeX-command-list)))
        (confirm (if override-confirm
                     (> (prefix-numeric-value override-confirm) 0)
@@ -531,94 +530,68 @@ remember to add /Library/TeX/texbin/ to your PATH"
                          ""))))
 
     ;; Now start the process
-    (setq file (funcall file))
-    (TeX-process-set-variable file 'TeX-command-next TeX-command-Show)
-    (funcall hook name command file)))
+    (let ((file (funcall file-fn)))
+      (TeX-process-set-variable file 'TeX-command-next TeX-command-Show)
+      (funcall hook name command file))))
 
-(defvar TeX-command-text)               ;Dynamically scoped.
-(defvar TeX-command-pos)                ;Dynamically scoped.
-
-(defun TeX-command-expand (command file &optional list)
-  "Expand COMMAND for FILE as described in LIST.
+(defun TeX-command-expand (command &optional list)
+  "Expand COMMAND for `TeX-active-master' as described in LIST.
 LIST default to `TeX-expand-list'.  As a special exception,
 `%%' can be used to produce a single `%' sign in the output
 without further expansion."
-  (defvar TeX-command-pos)
-  (let (pat
-       pos ;;FIXME: Should this be dynamically scoped?
-       entry TeX-command-text TeX-command-pos
-        expansion-res case-fold-search string expansion arguments)
+  (let ((TeX-expand-command command)
+        TeX-expand-pos
+        TeX-command-text
+        TeX-command-pos
+       pat entry case-fold-search string expansion arguments)
     (setq list (cons
                (list "%%" (lambda nil
-                            (setq pos (1+ pos))
+                            (setq TeX-expand-pos (1+ TeX-expand-pos))
                             "%"))
                (or list (TeX-expand-list)))
          pat (regexp-opt (mapcar #'car list)))
-    ;; `TeX-command-expand' is called with `file' argument being one
-    ;; of `TeX-master-file', `TeX-region-file' and
-    ;; `TeX-active-master'.  The return value of these functions
-    ;; sometimes needs suitable "decorations" for an argument for
-    ;; underlying shell or latex executable, or both, when the
-    ;; relavant file name involves some special characters such as
-    ;; space and multibyte characters.  Hence embed that function in a
-    ;; template prepared for that purpose.
-    (setq file (apply-partially
-               #'TeX--master-or-region-file-with-extra-quotes
-               file))
-    (while (setq pos (string-match pat command pos))
-      (setq string (match-string 0 command)
-           entry (assoc string list)
-           expansion (car (cdr entry)) ;Second element
-           arguments (cdr (cdr entry)) ;Remaining elements
-           string (save-match-data
-                    ;; Note regarding the special casing of `file':
-                    ;; `file' is prevented from being evaluated as a
-                    ;; function because inside of AUCTeX it only has
-                    ;; a meaning as a variable.  This makes sure that
-                    ;; a function definition made by an external
-                    ;; package (e.g. icicles) is not picked up.
-                    (cond ((and (not (eq expansion 'file))
-                                (functionp expansion))
-                           (apply expansion arguments))
-                          ((boundp expansion)
-                            (setq expansion-res
-                                  (apply (symbol-value expansion) arguments))
-                            (when (eq expansion 'file)
-                              ;; Advance past the file name in order to
-                              ;; prevent expanding any substring of it.
-                              (setq pos (+ pos (length expansion-res))))
-                           expansion-res)
-                          (t
-                           (error "Nonexpansion %s" expansion)))))
-      (if (stringp string)
-         (setq command
-               (replace-match string t t command)))))
-  command)
+    (let ((file-fn #'TeX--master-or-region-file-with-extra-quotes))
+      (while (setq TeX-expand-pos (string-match pat TeX-expand-command 
TeX-expand-pos))
+        (setq string (match-string 0 TeX-expand-command)
+             entry (assoc string list)
+             expansion (car (cdr entry)) ;Second element
+             arguments (cdr (cdr entry)) ;Remaining elements
+             string (save-match-data
+                      (cond
+                        ((memq expansion (list 'TeX-active-master
+                                               #'TeX-active-master))
+                         (let ((res (apply file-fn arguments)))
+                           ;; Advance past the file name in order to
+                           ;; prevent expanding any substring of it.
+                           (setq TeX-expand-pos
+                                 (+ TeX-expand-pos (length res)))
+                           res))
+                        ((functionp expansion)
+                         (apply expansion arguments))
+                       ((boundp expansion)
+                         (apply (symbol-value expansion) arguments))
+                       (t
+                        (error "Nonexpansion %s" expansion)))))
+        (if (stringp string)
+           (setq TeX-expand-command
+                 (replace-match string t t TeX-expand-command))))
+      TeX-expand-command)))
 
 (defun TeX--master-or-region-file-with-extra-quotes
-    (file-fn &optional extension nondirectory ask extra)
-  "Return file name with quote for shell.
-Helper function of `TeX-command-expand'.
-
-This is a kind of template.  How to use:
-Fix, by `apply-partially', the first argument FILE-FN as one of
-the three functions `TeX-master-file', `TeX-region-file' or
-`TeX-active-master'.  Then the result is just a wrapper for that
-function suitable in `TeX-command-expand'.
-
-As a wrapper described above, it passes EXTENSION, NONDIRECTORY
-and ASK to the \"bare\" function as-is, and arranges the returned
-file name for use with command shell.  I.e. it encloses the file
-name with space within quotes `\"' first when \" \\input\" is
-supplemented (indicated by dynamically binded variable
-`TeX-command-text' having string value.)  It also encloses the
-file name within \\detokenize{} when the following three
-conditions are met:
-1. compiling with standard (pdf)LaTeX or upLaTeX
-2. \" \\input\" is supplemented
-3. EXTRA is non-nil (default when expanding \"%T\")"
+    (&optional extension nondirectory ask extra)
+  "Return the current master or region file name with quote for shell.
+I.e. it encloses the file name with space within quotes `\"'
+first when \" \\input\" is supplemented (indicated by dynamically
+binded variable `TeX-command-text' having string value.)  It also
+encloses the file name within \\detokenize{} when the following
+three conditions are met:
+  1. compiling with standard (pdf)LaTeX or upLaTeX
+  2. \" \\input\" is supplemented
+  3. EXTRA is non-nil (default when expanding \"%T\")
+
+Helper function of `TeX-command-expand'."
   (shell-quote-argument
-   (let* ((raw (funcall file-fn extension nondirectory ask))
+   (let* ((raw (funcall #'TeX-active-master extension nondirectory ask))
          ;; String `TeX-command-text' means that the file name is
          ;; given through \input command.
          (quote-for-space (if (and (stringp TeX-command-text)
@@ -2475,6 +2448,7 @@ If REPARSE is non-nil, reparse the output log.
 If the file occurs in an included file, the file is loaded (if not
 already in an Emacs buffer) and the cursor is placed at the error."
   (let ((old-buffer (current-buffer))
+        ;; FIXME: default-major-mode has been removed in Emacs 26.
        (default-major-mode major-mode)
        max-index item)
 
@@ -3546,6 +3520,7 @@ please restart TeX error overview")))
          (with-current-buffer TeX-command-buffer
            ;; For consistency with `TeX-parse-TeX', use the major mode of
            ;; `TeX-command-buffer' when visiting the error point.
+            ;; FIXME: default-major-mode has been removed in Emacs 26.
            (let ((default-major-mode major-mode))
              ;; Find the error and display the help.
              (apply #'TeX-find-display-help item)))
diff --git a/tex.el b/tex.el
index b2bbbbf..ce31831 100644
--- a/tex.el
+++ b/tex.el
@@ -1,4 +1,4 @@
-;;; tex.el --- Support for TeX documents.
+;;; tex.el --- Support for TeX documents.  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 1985-2020 Free Software Foundation, Inc.
 
@@ -511,6 +511,15 @@ string."
   :type 'string)
 (make-variable-buffer-local 'TeX-command-extra-options)
 
+(defvar TeX-command-text nil
+  "Dynamically bound by `TeX-command-expand'.")
+(defvar TeX-command-pos nil
+  "Dynamically bound by `TeX-command-expand'.")
+(defvar TeX-expand-pos nil
+  "Dynamically bound by `TeX-command-expand'.")
+(defvar TeX-expand-command nil
+  "Dynamically bound by `TeX-command-expand'.")
+
 ;; This is the list of expansion for the commands in
 ;; TeX-command-list.  Not likely to be changed, but you may e.g. want
 ;; to handle .ps files.
@@ -581,9 +590,10 @@ string."
                    (or (if TeX-source-correlate-output-page-function
                            (funcall TeX-source-correlate-output-page-function))
                        "1")))
-    ;; `file' means to call `TeX-master-file', `TeX-region-file' or 
`TeX-active-master'
-    ("%s" file nil t)
-    ("%t" file t t)
+    ;; `TeX-active-master' calls either calls`TeX-master-file' or
+    ;; `TeX-region-file' returning the master or region file.
+    ("%s" TeX-active-master nil t)
+    ("%t" TeX-active-master t t)
     ;; If any TeX codes appear in the interval between %` and %', move
     ;; all of them after the interval and supplement " \input".  The
     ;; appearance is marked by leaving the bind to `TeX-command-text'
@@ -599,42 +609,42 @@ string."
            ""))
     (" \"\\" (lambda nil
               (if (eq TeX-command-pos t)
-                  (setq TeX-command-pos pos
-                        pos (+ 3 pos))
-                (setq pos (1+ pos)))))
+                  (setq TeX-command-pos TeX-expand-pos
+                        TeX-expand-pos (+ 3 TeX-expand-pos))
+                (setq TeX-expand-pos (1+ TeX-expand-pos)))))
     ("\"" (lambda nil (if (numberp TeX-command-pos)
                          (setq TeX-command-text
                                (concat
                                 TeX-command-text
-                                (substring command
+                                (substring TeX-expand-command
                                            TeX-command-pos
-                                           (1+ pos)))
-                               command
+                                           (1+ TeX-expand-pos)))
+                               TeX-expand-command
                                (concat
-                                (substring command
+                                (substring TeX-expand-command
                                            0
                                            TeX-command-pos)
-                                (substring command
-                                           (1+ pos)))
-                               pos TeX-command-pos
+                                (substring TeX-expand-command
+                                           (1+ TeX-expand-pos)))
+                               TeX-expand-pos TeX-command-pos
                                TeX-command-pos t)
-                       (setq pos (1+ pos)))))
+                       (setq TeX-expand-pos (1+ TeX-expand-pos)))))
     ("%'" (lambda nil
            (setq TeX-command-pos nil)
            (if (stringp TeX-command-text)
                (progn
-                 (setq pos (+ pos (length TeX-command-text) 9))
+                 (setq TeX-expand-pos (+ TeX-expand-pos (length 
TeX-command-text) 9))
                  (concat TeX-command-text " \"\\input\""))
              "")))
     ;; The fourth argument of t is actually for wrapper function
     ;; provided by `TeX--master-or-region-file-with-extra-quotes'.
     ;; See its doc string as well as the comments in
     ;; `TeX-command-expand'.
-    ("%T" file t t nil t)
+    ("%T" TeX-active-master t t nil t)
     ("%n" TeX-current-line)
-    ("%d" file "dvi" t)
-    ("%f" file "ps" t)
-    ("%o" (lambda nil (funcall file (TeX-output-extension) t)))
+    ("%d" TeX-active-master "dvi" t)
+    ("%f" TeX-active-master "ps" t)
+    ("%o" (lambda nil (TeX-active-master (TeX-output-extension) t)))
     ;; for source specials the file name generated for the xdvi
     ;; command needs to be relative to the master file, just in
     ;; case the file is in a different subdirectory
@@ -1237,7 +1247,7 @@ entry in `TeX-view-program-list-builtin'."
                                 (get-file-buffer (TeX-region-file t)))
                               (current-buffer))
        (pdf-sync-forward-search))
-    (let ((pdf (concat file "." (TeX-output-extension))))
+    (let ((pdf (TeX-active-master (TeX-output-extension))))
       (pop-to-buffer (or (find-buffer-visiting pdf)
                         (find-file-noselect pdf))))))
 
@@ -1259,9 +1269,10 @@ for the Evince-compatible entries in
 DE is the name of the desktop environment, APP is the name of
 viewer."
   (require 'url-util)
-  (let* ((uri (concat "file://" (url-encode-url
-                                (expand-file-name
-                                 (concat file "." (TeX-output-extension))))))
+  (let* ((uri (concat "file://"
+                      (url-encode-url
+                      (expand-file-name
+                       (TeX-active-master (TeX-output-extension))))))
         (owner (dbus-call-method
                 :session (format "org.%s.%s.Daemon" de app)
                 (format "/org/%s/%s/Daemon" de app)
@@ -1556,11 +1567,11 @@ predicates are true, nil otherwise."
     (unless (or (null executable)
                (cond
                 ((stringp executable)
-                 (executable-find (TeX-command-expand executable nil)))
+                 (executable-find (TeX-command-expand executable)))
                 ((listp executable)
                  (catch 'notfound
                    (dolist (exec executable t)
-                     (unless (executable-find (TeX-command-expand exec nil))
+                     (unless (executable-find (TeX-command-expand exec))
                        (throw 'notfound nil)))))))
       (error (format "Cannot find %S viewer.  \
 Select another one in `TeX-view-program-selection'" viewer)))
@@ -3122,7 +3133,6 @@ Possible values are nil, t, or a list of style names.
 
 (defmacro TeX-complete-make-expert-command-functions (thing list-var prefix)
   (let* ((plural (concat thing "s"))
-        (upcase (upcase thing))
         (upcase-plural (upcase plural)))
     `(progn
        (defvar ,(intern (format "%s-expert-%s-table" prefix thing))
@@ -3363,6 +3373,9 @@ Space will complete and exit."
         (let ((minibuffer-local-completion-map TeX-electric-macro-map))
           (call-interactively 'TeX-insert-macro)))))
 
+(defvar TeX-exit-mark nil
+  "Dynamically bound by `TeX-parse-macro' and `LaTeX-env-args'.")
+
 (defun TeX-parse-macro (symbol args)
   "How to parse TeX macros which takes one or more arguments.
 
@@ -3386,9 +3399,10 @@ TeX macro.  What is done depend on the type of the 
element:
   after the previous argument, or after the macro name if this is
   the first argument.  Please leave point located after the
   argument you are inserting.  If you want point to be located
-  somewhere else after all hooks have been processed, set the value
-  of `exit-mark'.  It will point nowhere, until the argument hook
-  set it.  By convention, these hooks all start with `TeX-arg-'.
+  somewhere else after all hooks have been processed, set the
+  value of `TeX-exit-mark'.  It will point nowhere, until the
+  argument hook set it.  By convention, these hooks all start
+  with `TeX-arg-'.
 
   list: If the car is a string, insert it as a prompt and the next
   element as initial input.  Otherwise, call the car of the list
@@ -3412,12 +3426,12 @@ TeX macro.  What is done depend on the type of the 
element:
             (> (point) (mark)))
        (exchange-point-and-mark))
     (insert TeX-esc symbol)
-    (let ((exit-mark (make-marker))
+    (let ((TeX-exit-mark (make-marker))
          (position (point)))
       (TeX-parse-arguments args)
-      (cond ((marker-position exit-mark)
-            (goto-char (marker-position exit-mark))
-            (set-marker exit-mark nil))
+      (cond ((marker-position TeX-exit-mark)
+            (goto-char (marker-position TeX-exit-mark))
+            (set-marker TeX-exit-mark nil))
            ((let ((element (assoc symbol TeX-insert-braces-alist)))
               ;; If in `TeX-insert-braces-alist' there is an element associated
               ;; to the current macro, use its value to decide whether 
inserting
@@ -3457,11 +3471,14 @@ INITIAL-INPUT is a string to insert before reading 
input."
      (TeX-read-string (TeX-argument-prompt optional prompt "Text") 
initial-input))
    optional))
 
+(defvar TeX-last-optional-rejected nil
+  "Dynamically bound by `TeX-parse-arguments'.")
+
 (defun TeX-parse-arguments (args)
   "Parse TeX macro arguments ARGS.
 
 See `TeX-parse-macro' for details."
-  (let ((last-optional-rejected nil))
+  (let ((TeX-last-optional-rejected nil))
     (while args
       (if (vectorp (car args))
          ;; Maybe get rid of all optional arguments.  See `TeX-insert-macro'
@@ -3476,7 +3493,7 @@ See `TeX-parse-macro' for details."
                          (equal current-prefix-arg '(4)))
                     (and (eq TeX-insert-macro-default-style 
'mandatory-args-only)
                          (null (equal current-prefix-arg '(4))))
-                    last-optional-rejected))
+                    TeX-last-optional-rejected))
            (let ((TeX-arg-opening-brace LaTeX-optop)
                  (TeX-arg-closing-brace LaTeX-optcl))
              (TeX-parse-argument t (if (equal (length (car args)) 1)
@@ -3484,7 +3501,7 @@ See `TeX-parse-macro' for details."
                                      (append (car args) nil)))))
        (let ((TeX-arg-opening-brace TeX-grop)
              (TeX-arg-closing-brace TeX-grcl))
-         (setq last-optional-rejected nil)
+         (setq TeX-last-optional-rejected nil)
          (TeX-parse-argument nil (car args))))
       (setq args (cdr args)))))
 
@@ -3529,7 +3546,7 @@ See `TeX-parse-macro' for details."
           (if (and (not optional) (TeX-active-mark))
               (progn
                 (exchange-point-and-mark))
-            (set-marker exit-mark (point)))
+            (set-marker TeX-exit-mark (point)))
           (insert TeX-arg-closing-brace)
           (setq insert-flag t))
          ((symbolp arg)
@@ -3553,13 +3570,13 @@ See `TeX-parse-macro' for details."
 If OPTIONAL, only insert it if not empty, and then use square brackets.
 If PREFIX is given, insert it before NAME."
   (if (and optional (string-equal name ""))
-      (setq last-optional-rejected t)
+      (setq TeX-last-optional-rejected t)
     (insert TeX-arg-opening-brace)
     (if prefix
        (insert prefix))
     (if (and (string-equal name "")
-            (null (marker-position exit-mark)))
-       (set-marker exit-mark (point))
+            (null (marker-position TeX-exit-mark)))
+       (set-marker TeX-exit-mark (point))
       (insert name))
     (insert TeX-arg-closing-brace)))
 
@@ -3949,7 +3966,7 @@ Generated by `TeX-auto-add-type'.")
 
 (defun TeX-safe-auto-write ()
   "Call `TeX-auto-write' safely."
-  (condition-case name
+  (condition-case _ignored
       (and (boundp 'TeX-auto-update)
           TeX-auto-update
           (TeX-auto-write))
@@ -3981,7 +3998,7 @@ Generated by `TeX-auto-add-type'.")
             (dir (file-name-directory file)))
        ;; Create auto directory if possible.
        (if (not (file-exists-p dir))
-           (condition-case name
+           (condition-case _ignored
                (make-directory dir)
              (error nil)))
        (if (file-writable-p file)
@@ -4301,7 +4318,7 @@ you should not use something like `[\\(]' for a character 
range."
        (goto-char (if end (min end (point-max)) (point-max)))
        (while (re-search-backward regexp beg t)
          (let* ((entry (cdr (TeX-member nil groups
-                                        (lambda (a b)
+                                        (lambda (_a b)
                                           (match-beginning (car b))))))
                 (symbol (nth 2 entry))
                 (match (nth 1 entry)))
@@ -5073,10 +5090,9 @@ Brace insertion is only done if point is in a math 
construct and
        :help "Make \"Next Error\" show warnings"])
      ["Compile and view" TeX-command-run-all
       :help "Compile the document until it is ready and open the viewer"])
-   (let ((file 'TeX-command-on-current)) ;; is this actually needed?
-     (delq nil
-          (mapcar #'TeX-command-menu-entry
-                  (TeX-mode-specific-command-list mode))))))
+   (delq nil
+        (mapcar #'TeX-command-menu-entry
+                (TeX-mode-specific-command-list mode)))))
 
 (defun TeX-mode-specific-command-list (mode)
   "Return the list of commands available in the given MODE."
@@ -5181,7 +5197,7 @@ Brace insertion is only done if point is in a math 
construct and
 (make-variable-buffer-local 'TeX-verbatim-p-function)
 
 ;; XXX: We only have an implementation for LaTeX mode at the moment (Oct 2009).
-(defun TeX-verbatim-p (&optional pos)
+(defun TeX-verbatim-p (&optional _pos)
   "Return non-nil if position POS is in a verbatim-like construct.
 A mode-specific implementation is required.  If it is not
 available, the function always returns nil."
@@ -5289,7 +5305,7 @@ not move point further than this value."
   ;; A value of 0 is nonsense.
   (when (= count 0) (setq count 1))
   (unless limit (setq limit (point-max)))
-  (dotimes (i (abs count))
+  (dotimes (_ (abs count))
     (if (< count 0)
        (forward-line -1)
       (beginning-of-line))
@@ -6225,7 +6241,7 @@ available from ")
         "https://www.gnu.org/software/auctex/";
         'face 'link
         'help-echo (concat "mouse-2, RET: Follow this link")
-        'action (lambda (button)
+        'action (lambda (_button)
                   (browse-url "https://www.gnu.org/software/auctex/";))
         'follow-link t)
        (insert " if your
@@ -6241,7 +6257,7 @@ tracker.  Visit ")
         "https://debbugs.gnu.org/cgi/pkgreport.cgi?pkg=auctex";
         'face 'link
         'help-echo (concat "mouse-2, RET: Follow this link")
-        'action (lambda (button)
+        'action (lambda (_button)
                   (browse-url 
"https://debbugs.gnu.org/cgi/pkgreport.cgi?pkg=auctex";))
         'follow-link t)
        (insert "\nto browse existing AUCTeX bugs.
@@ -6410,7 +6426,7 @@ NAME may be a package, a command, or a document."
       (when (and (called-interactively-p 'any)
                 (or (not name) (string= name "")))
        (let ((symbol (thing-at-point 'symbol))
-             contained completions doc)
+             contained completions)
          ;; Is the symbol at point contained in the lists of available
          ;; documentation?
          (setq contained (catch 'found
@@ -6451,7 +6467,7 @@ NAME may be a package, a command, or a document."
 ;; The FSF ispell.el might one day use this.
 (setq ispell-enable-tex-parser t)
 
-(defun TeX-run-ispell (command string file)
+(defun TeX-run-ispell (_command _string file)
   "Run ispell on current TeX buffer."
   (cond ((and (string-equal file (TeX-region-file))
              (fboundp 'ispell-region))
@@ -6471,8 +6487,7 @@ NAME may be a package, a command, or a document."
   (if (string-equal name "")
       (setq name (TeX-master-file)))
 
-  (let ((found nil)
-       (regexp (concat "\\`\\("
+  (let ((regexp (concat "\\`\\("
                        (mapconcat (lambda (dir)
                                     (regexp-quote
                                      (expand-file-name
@@ -6493,10 +6508,9 @@ NAME may be a package, a command, or a document."
       (let* ((buffer (car buffers))
             (name (buffer-file-name buffer)))
        (setq buffers (cdr buffers))
-       (if (and name (string-match regexp name))
-           (progn
-             (save-excursion (switch-to-buffer buffer) (ispell-buffer))
-             (setq found t)))))))
+       (when (and name (string-match regexp name))
+         (save-excursion (switch-to-buffer buffer) (ispell-buffer))
+          t)))))
 
 ;; Some versions of ispell 3 use this.
 (defvar ispell-tex-major-modes nil)

-----------------------------------------------------------------------

Summary of changes:
 Makefile.in                     |   3 +-
 context.el                      | 146 ++++++++++++-------------
 doc/auctex.texi                 |  29 ++---
 latex.el                        | 166 ++++++++++++++--------------
 preview.el.in                   |  47 ++++----
 style/Alegreya.el               |   4 +-
 style/AlegreyaSans.el           |   4 +-
 style/AnonymousPro.el           |   4 +-
 style/CJK.el                    |   4 +-
 style/CJKutf8.el                |   4 +-
 style/FiraMono.el               |   4 +-
 style/FiraSans.el               |   4 +-
 style/MinionPro.el              |   4 +-
 style/MyriadPro.el              |   4 +-
 style/XCharter.el               |   4 +-
 style/acro.el                   |   4 +-
 style/acronym.el                |   4 +-
 style/afterpage.el              |   4 +-
 style/algorithm.el              |   2 +-
 style/algpseudocode.el          |   2 +-
 style/alltt.el                  |   2 +-
 style/alphanum.el               |  13 +--
 style/amsart.el                 |   2 +-
 style/amsbook.el                |   2 +-
 style/amsbsy.el                 |   2 +-
 style/amsfonts.el               |   4 +-
 style/amsmath.el                |   2 +-
 style/amsopn.el                 |   4 +-
 style/amssymb.el                |   4 +-
 style/amstex.el                 |   4 +-
 style/amstext.el                |   2 +-
 style/amsthm.el                 |  50 ++++-----
 style/appendix.el               |  76 +++++++++++++
 style/arabxetex.el              |  10 +-
 style/array.el                  |   4 +-
 style/article.el                |   2 +-
 style/attachfile.el             |   4 +-
 style/australian.el             |   4 +-
 style/austrian.el               |   4 +-
 style/babel.el                  |  20 ++--
 style/baskervaldx.el            |   4 +-
 style/beamer.el                 |   2 +-
 style/beamerarticle.el          |   4 +-
 style/beamerswitch.el           |   4 +-
 style/biblatex.el               |   4 +-
 style/bicaption.el              |   8 +-
 style/bidi.el                   |   2 +-
 style/bidibeamer.el             |   4 +-
 style/bigdelim.el               |   4 +-
 style/bigstrut.el               |   4 +-
 style/bm.el                     |   4 +-
 style/book.el                   |   2 +-
 style/booktabs.el               |   6 +-
 style/breqn.el                  |   2 +-
 style/bulgarian.el              |   4 +-
 style/canadian.el               |   4 +-
 style/captcont.el               |   4 +-
 style/caption.el                |  10 +-
 style/changelog.el              |   5 +-
 style/cleveref.el               |   4 +-
 style/color.el                  |   8 +-
 style/colortbl.el               |   4 +-
 style/commath.el                |   4 +-
 style/comment.el                |   2 +-
 style/csquotes.el               |   2 +-
 style/currvita.el               |   4 +-
 style/czech.el                  |   2 +-
 style/danish.el                 |   2 +-
 style/dashundergaps.el          |   4 +-
 style/dcolumn.el                |   4 +-
 style/dinbrief.el               |   2 +-
 style/dk-bib.el                 |   4 +-
 style/dk.el                     |   2 +-
 style/doc.el                    |   8 +-
 style/dutch.el                  |   2 +-
 style/emp.el                    |   4 +-
 style/empheq.el                 |   2 +-
 style/english.el                |   2 +-
 style/enumitem.el               |  12 +-
 style/environ.el                |   4 +-
 style/epigraph.el               |   4 +-
 style/epsf.el                   |   4 +-
 style/erewhon.el                |   4 +-
 style/eso-pic.el                |   4 +-
 style/everysel.el               |   4 +-
 style/exam.el                   |  65 +++++------
 style/exercise.el               |   4 +-
 style/expl3.el                  |   2 +-
 style/fancyhdr.el               |   2 +-
 style/fancynum.el               |   4 +-
 style/fancyref.el               |   4 +-
 style/fancyvrb.el               | 235 +++++++++++++++++++++++++++++++++++-----
 style/fbb.el                    |   4 +-
 style/fbox.el                   |   2 +-
 style/filecontents.el           |   4 +-
 style/flashcards.el             |   4 +-
 style/floatrow.el               |  30 ++---
 style/foils.el                  |   4 +-
 style/fontaxes.el               |   2 +-
 style/fontenc.el                |   4 +-
 style/fontspec.el               |  14 +--
 style/footmisc.el               |   4 +-
 style/framed.el                 |   4 +-
 style/francais.el               |   4 +-
 style/french.el                 |   4 +-
 style/frenchb.el                |   4 +-
 style/fvextra.el                |   4 +-
 style/geometry.el               |   4 +-
 style/german.el                 |   2 +-
 style/gloss-italian.el          |   4 +-
 style/graphics.el               |   2 +-
 style/graphicx.el               |  43 ++++----
 style/harvard.el                | 162 +++++++++++++--------------
 style/hologo.el                 |   8 +-
 style/hyperref.el               |   2 +-
 style/icelandic.el              |   4 +-
 style/ifluatex.el               |  54 ++++-----
 style/imakeidx.el               |   4 +-
 style/index.el                  |   4 +-
 style/inputenc.el               |   4 +-
 style/italian.el                |   4 +-
 style/j-article.el              |   2 +-
 style/j-book.el                 |   2 +-
 style/j-report.el               |   2 +-
 style/jarticle.el               |   2 +-
 style/jbook.el                  |   2 +-
 style/jreport.el                |   2 +-
 style/jsarticle.el              |   2 +-
 style/jsbook.el                 |   2 +-
 style/jsreport.el               |   4 +-
 style/jura.el                   |   4 +-
 style/jurabib.el                |   4 +-
 style/kantlipsum.el             |   4 +-
 style/kpfonts.el                |   2 +-
 style/latexinfo.el              |   4 +-
 style/letter.el                 |   2 +-
 style/lettrine.el               |   4 +-
 style/lipsum.el                 |   4 +-
 style/listings.el               |   2 +-
 style/longtable.el              |   4 +-
 style/lscape.el                 |   4 +-
 style/ltablex.el                |   4 +-
 style/ltugboat.el               |  10 +-
 style/ltx-base.el               |   4 +-
 style/ltxdoc.el                 |   4 +-
 style/ltxguide.el               |   2 +-
 style/ltxtable.el               |   4 +-
 style/luacode.el                |   4 +-
 style/luatextra.el              |   4 +-
 style/makeidx.el                |   4 +-
 style/marginnote.el             |   4 +-
 style/mathtools.el              |   2 +-
 style/mdframed.el               |  18 +--
 style/mdsymbol.el               |   4 +-
 style/mdwlist.el                |   4 +-
 style/memoir.el                 |   4 +-
 style/menukeys.el               | 130 +++++++++++-----------
 style/metalogo.el               |   4 +-
 style/mflogo.el                 |   4 +-
 style/minted.el                 |   2 +-
 style/mn2e.el                   |   4 +-
 style/mnras.el                  |   4 +-
 style/moodle.el                 |   6 +-
 style/multicol.el               |   4 +-
 style/multido.el                |   4 +-
 style/multind.el                |   4 +-
 style/multirow.el               |   4 +-
 style/multitoc.el               |   4 +-
 style/nameref.el                |   4 +-
 style/natbib.el                 |   6 +-
 style/naustrian.el              |   4 +-
 style/newfloat.el               |   4 +-
 style/newpxmath.el              |   4 +-
 style/newpxtext.el              |   4 +-
 style/newtxmath.el              |   4 +-
 style/newtxsf.el                |   4 +-
 style/newtxtext.el              |   4 +-
 style/newtxttt.el               |   4 +-
 style/newzealand.el             |   4 +-
 style/ngerman.el                |   2 +-
 style/nicefrac.el               |   4 +-
 style/nomencl.el                |   4 +-
 style/ntheorem.el               |  25 +++--
 style/ocg-p.el                  |   4 +-
 style/ocgx.el                   |   4 +-
 style/overpic.el                |   2 +-
 style/paracol.el                |  12 +-
 style/paralist.el               |   4 +-
 style/pdflscape.el              |   4 +-
 style/pdfpages.el               |   4 +-
 style/pdfsync.el                |   4 +-
 style/placeins.el               |   4 +-
 style/plext.el                  |   4 +-
 style/plfonts.el                |   2 +-
 style/plhb.el                   |   2 +-
 style/polish.el                 |   4 +-
 style/polski.el                 |   4 +-
 style/polyglossia.el            |   4 +-
 style/preview.el                |   4 +-
 style/prosper.el                |   2 +-
 style/psfig.el                  |   4 +-
 style/pst-grad.el               |   4 +-
 style/pst-node.el               |   4 +-
 style/pst-plot.el               |   4 +-
 style/pst-slpe.el               |   4 +-
 style/pstricks.el               |   2 +-
 style/pythontex.el              |  92 ++++++++--------
 style/ragged2e.el               |   4 +-
 style/relsize.el                |   4 +-
 style/report.el                 |   2 +-
 style/revtex4-2.el              |   2 +-
 style/ruby.el                   |   4 +-
 style/scrartcl.el               |  20 ++--
 style/scrbase.el                |   4 +-
 style/scrbook.el                |   4 +-
 style/scrlttr2.el               |   4 +-
 style/scrpage2.el               |   2 +-
 style/scrreprt.el               |   4 +-
 style/setspace.el               |   4 +-
 style/shortvrb.el               |   2 +-
 style/siunitx.el                |   4 +-
 style/slides.el                 |   4 +-
 style/slovak.el                 |   2 +-
 style/sourcecodepro.el          |   4 +-
 style/splitidx.el               |  22 ++--
 style/subcaption.el             |   4 +-
 style/subfigure.el              |   4 +-
 style/subfiles.el               |   4 +-
 style/swedish.el                |   2 +-
 style/tabularx.el               |   4 +-
 style/tabulary.el               |   4 +-
 style/tarticle.el               |   4 +-
 style/tbook.el                  |   4 +-
 style/tcolorbox.el              |  14 +--
 style/tcolorboxlib-raster.el    |   4 +-
 style/tex-live.el               |   6 +-
 style/textcomp.el               |   2 +-
 style/textpos.el                |   4 +-
 style/theorem.el                |   4 +-
 style/thm-restate.el            |   4 +-
 style/thmtools.el               |  12 +-
 style/tikz.el                   |   2 +-
 style/titleps.el                |  18 +--
 style/titlesec.el               |  18 +--
 style/titletoc.el               |  14 +--
 style/transparent.el            |   4 +-
 style/treport.el                |   4 +-
 style/ulem.el                   |   4 +-
 style/unicode-math.el           |   4 +-
 style/units.el                  |   4 +-
 style/url.el                    |   2 +-
 style/varioref.el               |   4 +-
 style/verbatim.el               |   2 +-
 style/virtex.el                 |   2 +-
 style/vwcol.el                  |   4 +-
 style/wrapfig.el                |   2 +-
 style/xcolor.el                 |  66 +++++------
 style/xkcdcolors.el             |   4 +-
 style/xltabular.el              |   4 +-
 style/xparse.el                 |   2 +-
 style/xspace.el                 |   4 +-
 style/zlmtt.el                  |   4 +-
 tests/japanese/preview-latex.el |   6 +-
 tests/tex/command-expansion.el  |  75 +++++++++----
 tex-buf.el                      | 182 ++++++++++++++-----------------
 tex-ispell.el                   |   4 +-
 tex-jp.el                       |  11 +-
 tex.el                          | 152 ++++++++++++++------------
 texmathp.el                     |  15 ++-
 269 files changed, 1583 insertions(+), 1335 deletions(-)
 create mode 100644 style/appendix.el


hooks/post-receive
-- 
GNU AUCTeX



reply via email to

[Prev in Thread] Current Thread [Next in Thread]