[AUCTeX-devel] [elpa] externals/auctex 95bef06 21/69: Merge branch 'master' into simplify-TeX-parse-error

[Tassilo Horn]

branch: externals/auctex
commit 95bef0636831eaabdf5a42df04a16b099e91426b
Merge: c1dcb84 6d4f7d1
Author: Tassilo Horn <address@hidden>
Commit: Tassilo Horn <address@hidden>

    Merge branch 'master' into simplify-TeX-parse-error
---
 ChangeLog          |    5 +++++
 style/mathtools.el |    4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 71ccc62..19e019c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-15  Vladimir Lomov  <address@hidden>
+
+       * style/mathtools.el ("mathtools"): Don't use the removed
+       `LaTeX-amsmath-env-aligned' function.
+
 2014-08-14  Mos� Giordano  <address@hidden>
 
        * latex.el (LaTeX-insert-label): Remove.
diff --git a/style/mathtools.el b/style/mathtools.el
index ae63289..e550403 100644
--- a/style/mathtools.el
+++ b/style/mathtools.el
@@ -67,8 +67,8 @@
      (add-to-list 'LaTeX-mathtools-package-options elt))
 
    (LaTeX-add-environments
-    '("lgathered" LaTeX-amsmath-env-aligned)
-    '("rgathered" LaTeX-amsmath-env-aligned)
+    '("lgathered" ["Vertical position (t or b)"])
+    '("rgathered" ["Vertical position (t or b)"])
     '("multlined" LaTeX-mathtools-env-multlined)
     '("matrix*" LaTeX-mathtools-env-matrix-starred)
     '("pmatrix*" LaTeX-mathtools-env-matrix-starred)