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

[Tassilo Horn]

branch: externals/auctex
commit c6d3152545eae9258cad5ed71f3f7303e2edf56c
Merge: 16af75d babe224
Author: Tassilo Horn <address@hidden>
Commit: Tassilo Horn <address@hidden>

    Merge branch 'master' into simplify-TeX-parse-error
---
 ChangeLog        |   20 ++++++++++++++++++++
 context.el       |    2 +-
 latex.el         |    2 +-
 style/amstext.el |    2 +-
 tex-info.el      |    6 +++---
 texmathp.el      |    5 +++--
 6 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4a88c13..2ce2a0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2014-10-02  Ikumi Keita  <address@hidden>
+
+       * texmathp.el (texmathp-tex-commands-default): Move equation*
+       environment to AMS-LaTeX section.
+       (texmathp-why): Fix docstring.
+
+2014-10-02  Ikumi Keita  <address@hidden>
+
+       * style/amstext.el (LaTeX-amstext-package-options): Rename from
+       `LaTeX-amstext-package-option'.
+
+2014-10-02  Ikumi Keita  <address@hidden>
+
+       * tex-info.el (Texinfo-mark-environment, Texinfo-mark-section)
+       (Texinfo-mark-node): Use `push-mark' instead of `set-mark'.
+
+       * latex.el (LaTeX-mark-environment): Ditto.
+
+       * context.el (ConTeXt-mark-environment): Ditto.
+
 2014-09-25  Tassilo Horn  <address@hidden>
 
        * latex.el (LaTeX-insert-environment): Pass correct \end buffer
diff --git a/context.el b/context.el
index 3cc890f..b9ce2c0 100644
--- a/context.el
+++ b/context.el
@@ -839,7 +839,7 @@ the contents."
   (interactive)
   (let ((cur (point)))
     (ConTeXt-find-matching-stop inner)
-    (set-mark (point))
+    (push-mark (point))
     (goto-char cur)
     (ConTeXt-find-matching-start inner)
     (TeX-activate-region)))
diff --git a/latex.el b/latex.el
index aa755c9..143cb4e 100644
--- a/latex.el
+++ b/latex.el
@@ -4172,7 +4172,7 @@ environments."
       (goto-char cur)
       (dotimes (c count) (LaTeX-find-matching-begin))
       (setq beg (point)))
-    (set-mark end)
+    (push-mark end)
     (goto-char beg)
     (TeX-activate-region)))
 
diff --git a/style/amstext.el b/style/amstext.el
index ea6f619..d0a8e87 100644
--- a/style/amstext.el
+++ b/style/amstext.el
@@ -11,7 +11,7 @@
      '("text" t))))
  LaTeX-dialect)
 
-(defvar LaTeX-amstext-package-option nil
+(defvar LaTeX-amstext-package-options nil
   "Package options for the amstext package.")
 
 ;;; amstext.el ends here.
diff --git a/tex-info.el b/tex-info.el
index 2c94b6a..83e0081 100644
--- a/tex-info.el
+++ b/tex-info.el
@@ -183,7 +183,7 @@ environments."
        (unless (= (1+ c) count)
          (beginning-of-line 0)))
       (setq beg (point)))
-    (set-mark end)
+    (push-mark end)
     (goto-char beg)
     (TeX-activate-region)))
 
@@ -264,7 +264,7 @@ the section."
            (when  (looking-at "address@hidden>")
              (set boundary (point))))))
 
-      (set-mark end)
+      (push-mark end)
       (goto-char beg)
       (TeX-activate-region) )))
 
@@ -284,7 +284,7 @@ beginning of keyword address@hidden' or address@hidden'."
                    (progn (beginning-of-line) (point))))))
 
     (when (and beg end)
-      (set-mark end)
+      (push-mark end)
       (goto-char beg)
       (TeX-activate-region) )))
 
diff --git a/texmathp.el b/texmathp.el
index 350406b..f13e237 100644
--- a/texmathp.el
+++ b/texmathp.el
@@ -117,7 +117,7 @@
     ("\vcenter"     arg-off)
 
     ;; Standard LaTeX
-    ("equation"      env-on)      ("equation*"     env-on)
+    ("equation"      env-on)
     ("eqnarray"      env-on)      ("eqnarray*"     env-on)
     ("math"          env-on)
     ("displaymath"   env-on)
@@ -132,6 +132,7 @@
     ("\ensuremath"  arg-on)
 
     ;; AMS-LaTeX
+    ("equation*"     env-on)
     ("align"         env-on)      ("align*"        env-on)
     ("gather"        env-on)      ("gather*"       env-on)
     ("multline"      env-on)      ("multline*"     env-on)
@@ -230,7 +231,7 @@ will be considered arguments of the macro independent of 
its definition."
   "After a call to `texmathp' this variable shows why math-mode is on or off.
 The value is a cons cell (MATCH . POSITION).
 MATCH is a string like a car of an entry in `texmathp-tex-commands', e.q.
-\"equation\" or \"\ensuremath\" or \"\[\" or \"$\".
+\"equation\" or \"\ensuremath\" or \"\=\[\" or \"$\".
 POSITION is the buffer position of the match.  If there was no match,
 it points to the limit used for searches, usually two paragraphs up.")