[AUCTeX-diffs] [elpa] externals/auctex 0f9e2d7c22 4/5: Merge remote-tracking branch 'origin/master' into externals/auctex

[Tassilo Horn]

branch: externals/auctex
commit 0f9e2d7c2292f7ff90082181181ad010e76110d5
Merge: 484df614d8 34befcc176
Author: Tassilo Horn <tsdh@gnu.org>
Commit: Tassilo Horn <tsdh@gnu.org>

    Merge remote-tracking branch 'origin/master' into externals/auctex
---
 latex.el        | 18 ++++++++++--------
 style/minted.el | 21 ++++++++++++---------
 tex.el          |  2 +-
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/latex.el b/latex.el
index 0d55f269fd..06627c4bdb 100644
--- a/latex.el
+++ b/latex.el
@@ -1742,11 +1742,11 @@ This is necessary since index entries may contain 
commands and stuff.")
         (1 2) LaTeX-auto-arguments)
        (,(concat "\\\\\\(?:new\\|provide\\)command\\*?{?\\\\\\(" token 
"+\\)}?")
         1 TeX-auto-symbol)
-       (,(concat "\\\\newenvironment\\*?{?\\(" token 
"+\\)}?\\[\\([0-9]+\\)\\]\\[")
+       (,(concat "\\\\newenvironment\\*?{?\\(" token 
"+\\)\\*?}?\\[\\([0-9]+\\)\\]\\[")
         (1 2) LaTeX-auto-env-args-with-opt)
-       (,(concat "\\\\newenvironment\\*?{?\\(" token 
"+\\)}?\\[\\([0-9]+\\)\\]")
+       (,(concat "\\\\newenvironment\\*?{?\\(" token 
"+\\)\\*?}?\\[\\([0-9]+\\)\\]")
         (1 2) LaTeX-auto-env-args)
-       (,(concat "\\\\newenvironment\\*?{?\\(" token "+\\)}?")
+       (,(concat "\\\\newenvironment\\*?{?\\(" token "+\\)\\*?}?")
         1 LaTeX-auto-environment)
        (,(concat "\\\\newtheorem{\\(" token "+\\)}") 1 LaTeX-auto-environment)
        ("\\\\input{\\(\\.*[^#}%\\\\\\.\n\r]+\\)\\(\\.[^#}%\\\\\\.\n\r]+\\)?}"
@@ -5849,11 +5849,13 @@ returned."
   (catch 'found
     (dolist (var (list LaTeX-math-list LaTeX-math-default))
       (dolist (e var)
-        (when (string= (cadr e) sym)
-          (let ((char (nth 3 e)))
-            (when char
-              (throw 'found
-                     (concat " " (char-to-string char))))))))))
+        (let ((val (cadr e)))
+          (when (and (stringp val)
+                     (string= val sym))
+            (let ((char (nth 3 e)))
+              (when char
+                (throw 'found
+                       (concat " " (char-to-string char)))))))))))
 
 (defvar LaTeX-math-mode-menu)
 (define-minor-mode LaTeX-math-mode
diff --git a/style/minted.el b/style/minted.el
index 93e8052aea..354213be8a 100644
--- a/style/minted.el
+++ b/style/minted.el
@@ -130,17 +130,20 @@
     ;; `LaTeX-minted-style-list' here, but with a file local var like:
     ;;     %%% TeX-command-extra-options: "-shell-escape"
     ;; in a .tex file, Emacs asks to apply a variable which is not
-    ;; safe and does not restore the frame; the splitted frame
+    ;; safe and does not restore the window; the splitted frame
     ;; remains.  I couldn't figure out why, so for now, I add the
-    ;; styles from Pygments version 2.9 here.
+    ;; styles from Pygments version 2.11 here.
     ("style" ("abap" "algol" "algol_nu" "arduino" "autumn"
-              "borland" "bw" "colorful" "default" "emacs"
-              "friendly" "fruity" "gruvbox-dark" "gruvbox-light"
-              "igor" "inkpot" "lovelace" "manni" "material" "monokai"
-              "murphy" "native" "paraiso-dark" "paraiso-light"
-              "pastie" "perldoc" "rainbow_dash" "rrt" "sas"
-              "solarized-dark" "solarized-light" "stata" "stata-dark"
-              "stata-light" "tango" "trac" "vim" "vs" "xcode" "zenburn"))
+              "borland" "bw" "colorful" "default" "dracula"
+              "emacs" "friendly" "friendly_grayscale" "fruity"
+              "gruvbox-dark" "gruvbox-light" "igor" "inkpot"
+              "lilypond" "lovelace" "manni" "material"
+              "monokai" "murphy" "native" "one-dark"
+              "paraiso-dark" "paraiso-light" "pastie" "perldoc"
+              "rainbow_dash" "rrt" "sas" "solarized-dark"
+              "solarized-light" "stata-dark" "stata-light"
+              "stata" "tango" "trac" "vim" "vs" "xcode"
+              "zenburn"))
     ("stepnumber")
     ("stepnumberfromfirst")
     ("stepnumberoffsetvalues" ("true" "false"))
diff --git a/tex.el b/tex.el
index 79a5f64d58..e3f4d118e7 100644
--- a/tex.el
+++ b/tex.el
@@ -5691,7 +5691,7 @@ escape characters, such as \"\\\" in LaTeX."
         (goto-char macro-start)
         (forward-char (length TeX-esc))
         (buffer-substring-no-properties
-         (point) (progn (skip-chars-forward "@A-Za-z") (point)))))))
+         (point) (progn (skip-chars-forward "@A-Za-z*") (point)))))))
 
 (defvar TeX-search-forward-comment-start-function nil
   "Function to find the start of a comment.