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

[Ikumi Keita]

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  ddb0f08ff1adb8a89f2d808dd6109ed535e552b3 (commit)
      from  bf0330029614c7e099fa2978856ae1539168efe3 (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 ddb0f08ff1adb8a89f2d808dd6109ed535e552b3
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Date:   Sat Feb 5 19:53:25 2022 +0900

    Add default entries to LaTeX-indent-environment-list (bug#28405)
    
    My previous commits disregard user's customization on
    LaTeX-indent-environment-list. Reconsideration led to move entries to
    its default value.
    
    * style/amsmath.el ("amsmath"):
    * style/mathtools.el ("mathtools"):
    Move entries into default value in latex.el.
    * latex.el (LaTeX-indent-environment-list): Pull in those entries.
    Add math envs without alignment as well to fix bug#28405.

diff --git a/latex.el b/latex.el
index e361c214..97eb5b16 100644
--- a/latex.el
+++ b/latex.el
@@ -3545,12 +3545,59 @@ consideration just as is in the non-commented source 
code."
     ("array" LaTeX-indent-tabular)
     ("eqnarray" LaTeX-indent-tabular)
     ("eqnarray*" LaTeX-indent-tabular)
+    ;; envs of amsmath.sty
+    ("align"       LaTeX-indent-tabular)
+    ("align*"      LaTeX-indent-tabular)
+    ("aligned"     LaTeX-indent-tabular)
+    ("alignat"     LaTeX-indent-tabular)
+    ("alignat*"    LaTeX-indent-tabular)
+    ("alignedat"   LaTeX-indent-tabular)
+    ("xalignat"    LaTeX-indent-tabular)
+    ("xalignat*"   LaTeX-indent-tabular)
+    ("xxalignat"   LaTeX-indent-tabular)
+    ("flalign"     LaTeX-indent-tabular)
+    ("flalign*"    LaTeX-indent-tabular)
+    ("split"       LaTeX-indent-tabular)
+    ("matrix"      LaTeX-indent-tabular)
+    ("pmatrix"     LaTeX-indent-tabular)
+    ("bmatrix"     LaTeX-indent-tabular)
+    ("Bmatrix"     LaTeX-indent-tabular)
+    ("vmatrix"     LaTeX-indent-tabular)
+    ("Vmatrix"     LaTeX-indent-tabular)
+    ("smallmatrix" LaTeX-indent-tabular)
+    ("cases"       LaTeX-indent-tabular)
+    ;; envs of mathtools.sty
+    ("matrix*"       LaTeX-indent-tabular)
+    ("pmatrix*"      LaTeX-indent-tabular)
+    ("bmatrix*"      LaTeX-indent-tabular)
+    ("Bmatrix*"      LaTeX-indent-tabular)
+    ("vmatrix*"      LaTeX-indent-tabular)
+    ("Vmatrix*"      LaTeX-indent-tabular)
+    ("smallmatrix*"  LaTeX-indent-tabular)
+    ("psmallmatrix"  LaTeX-indent-tabular)
+    ("psmallmatrix*" LaTeX-indent-tabular)
+    ("bsmallmatrix"  LaTeX-indent-tabular)
+    ("bsmallmatrix*" LaTeX-indent-tabular)
+    ("vsmallmatrix"  LaTeX-indent-tabular)
+    ("vsmallmatrix*" LaTeX-indent-tabular)
+    ("Vsmallmatrix"  LaTeX-indent-tabular)
+    ("Vsmallmatrix*" LaTeX-indent-tabular)
+    ("dcases"        LaTeX-indent-tabular)
+    ("dcases*"       LaTeX-indent-tabular)
+    ("rcases"        LaTeX-indent-tabular)
+    ("rcases*"       LaTeX-indent-tabular)
+    ("drcases"       LaTeX-indent-tabular)
+    ("drcases*"      LaTeX-indent-tabular)
+    ("cases*"        LaTeX-indent-tabular)
     ;; The following should have their own, smart indentation function.
     ;; Some other day.
     ("displaymath")
     ("equation")
     ("picture")
-    ("tabbing"))
+    ("tabbing")
+    ;; envs from amsmath.sty
+    ("gather") ("gather*") ("gathered")
+    ("equation*") ("multline") ("multline*"))
   "Alist of environments with special indentation.
 The second element in each entry is the function to calculate the
 indentation level in columns.
diff --git a/style/amsmath.el b/style/amsmath.el
index e3cce752..5e7812e7 100644
--- a/style/amsmath.el
+++ b/style/amsmath.el
@@ -152,30 +152,6 @@
                    ("flalign"    . LaTeX-amsmath-label)
                    ("gather"     . LaTeX-amsmath-label))))
 
-   (setq-local LaTeX-indent-environment-list
-               (append LaTeX-indent-environment-list
-                       '(("equation*")
-                         ("align"       LaTeX-indent-tabular)
-                         ("align*"      LaTeX-indent-tabular)
-                         ("aligned"     LaTeX-indent-tabular)
-                         ("alignat"     LaTeX-indent-tabular)
-                         ("alignat*"    LaTeX-indent-tabular)
-                         ("alignedat"   LaTeX-indent-tabular)
-                         ("xalignat"    LaTeX-indent-tabular)
-                         ("xalignat*"   LaTeX-indent-tabular)
-                         ("xxalignat"   LaTeX-indent-tabular)
-                         ("flalign"     LaTeX-indent-tabular)
-                         ("flalign*"    LaTeX-indent-tabular)
-                         ("split"       LaTeX-indent-tabular)
-                         ("matrix"      LaTeX-indent-tabular)
-                         ("pmatrix"     LaTeX-indent-tabular)
-                         ("bmatrix"     LaTeX-indent-tabular)
-                         ("Bmatrix"     LaTeX-indent-tabular)
-                         ("vmatrix"     LaTeX-indent-tabular)
-                         ("Vmatrix"     LaTeX-indent-tabular)
-                         ("smallmatrix" LaTeX-indent-tabular)
-                         ("cases"       LaTeX-indent-tabular))))
-
    (set (make-local-variable 'TeX-braces-association)
         (append '(("\\lvert" . "\\rvert")
                   ("\\lVert" . "\\rVert"))
diff --git a/style/mathtools.el b/style/mathtools.el
index 4643df7e..d0e1f262 100644
--- a/style/mathtools.el
+++ b/style/mathtools.el
@@ -472,31 +472,6 @@ Put line break macro on the last line.  Next, insert an 
ampersand."
                    ("multlined" . LaTeX-amsmath-label))
                  LaTeX-label-alist))
 
-   (setq-local LaTeX-indent-environment-list
-               (append LaTeX-indent-environment-list
-                       '(("matrix*"       LaTeX-indent-tabular)
-                         ("pmatrix*"      LaTeX-indent-tabular)
-                         ("bmatrix*"      LaTeX-indent-tabular)
-                         ("Bmatrix*"      LaTeX-indent-tabular)
-                         ("vmatrix*"      LaTeX-indent-tabular)
-                         ("Vmatrix*"      LaTeX-indent-tabular)
-                         ("smallmatrix*"  LaTeX-indent-tabular)
-                         ("psmallmatrix"  LaTeX-indent-tabular)
-                         ("psmallmatrix*" LaTeX-indent-tabular)
-                         ("bsmallmatrix"  LaTeX-indent-tabular)
-                         ("bsmallmatrix*" LaTeX-indent-tabular)
-                         ("vsmallmatrix"  LaTeX-indent-tabular)
-                         ("vsmallmatrix*" LaTeX-indent-tabular)
-                         ("Vsmallmatrix"  LaTeX-indent-tabular)
-                         ("Vsmallmatrix*" LaTeX-indent-tabular)
-                         ("dcases"        LaTeX-indent-tabular)
-                         ("dcases*"       LaTeX-indent-tabular)
-                         ("rcases"        LaTeX-indent-tabular)
-                         ("rcases*"       LaTeX-indent-tabular)
-                         ("drcases"       LaTeX-indent-tabular)
-                         ("drcases*"      LaTeX-indent-tabular)
-                         ("cases*"        LaTeX-indent-tabular))))
-
    ;; RefTeX support: Add env's with `reftex-add-label-environments'
    (when (fboundp 'reftex-add-label-environments)
      (let ((envs '(("lgathered"  ?e nil nil t)

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

Summary of changes:
 latex.el           | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 style/amsmath.el   | 24 ------------------------
 style/mathtools.el | 25 -------------------------
 3 files changed, 48 insertions(+), 50 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX