[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[AUCTeX-diffs] [elpa] externals/auctex 3a809a9 18/27: Fix regression of
From: |
Tassilo Horn |
Subject: |
[AUCTeX-diffs] [elpa] externals/auctex 3a809a9 18/27: Fix regression of font lock |
Date: |
Sat, 27 Jun 2020 03:17:44 -0400 (EDT) |
branch: externals/auctex
commit 3a809a9684eaebb0e23bcf2774747891c5b93a57
Author: Ikumi Keita <ikumi@ikumi.que.jp>
Commit: Ikumi Keita <ikumi@ikumi.que.jp>
Fix regression of font lock
* font-latex.el (font-latex-match-math-envII): Store the position of
"\begin{foo}" as (match-beginnig 0) so that `font-lock-multiline' text
property covers it. Store the range of math expression as
subexpression 1.
(font-latex-make-user-keywords): Arrange in accord with the above
change.
---
font-latex.el | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/font-latex.el b/font-latex.el
index 449c2d1..ad2153f 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -849,7 +849,7 @@ Generated by `font-latex-make-user-keywords'.")))
(0 'font-latex-warning-face t t)
(1 'font-latex-math-face append t))
(font-latex-match-math-envII
- (0 'font-latex-math-face append t))
+ (1 'font-latex-math-face append t))
(font-latex-match-simple-command
(0 'font-latex-sedate-face append))
(font-latex-match-script
@@ -1810,13 +1810,13 @@ The \\begin{equation} incl. arguments in the same line
and
;; the \end{<env>} construct below
"\\(\\*?}\\)"
;; Match an optional and possible
- ;; mandatory argument(s) as long as
- ;; they are on the same line with
- ;; no spaces in-between
+ ;; mandatory argument(s). They can
+ ;; span multiple lines.
"\\(?:\\[[^][]*\\(?:\\[[^][]*\\][^][]*\\)*\\]\\)?"
"\\(?:{[^}]*}\\)*")
limit t)
- (let ((beg (match-end 0)) end)
+ (let ((beg (match-end 0)) end
+ (beg-of-begin (match-beginning 0)))
(if (re-search-forward (concat "\\\\end[ \t]*{"
(regexp-quote
(buffer-substring-no-properties
@@ -1831,8 +1831,12 @@ The \\begin{equation} incl. arguments in the same line
and
(font-lock-unfontify-region font-latex--updated-region-end end)
(setq font-latex--updated-region-end end)))
(goto-char beg)
- (setq end beg))
- (store-match-data (list beg end))
+ (setq end beg
+ beg-of-begin beg))
+ ;; Store the position of "\begin{foo}" as (match-beginnig 0) so
+ ;; that `font-lock-multiline' text property covers it. This keeps
+ ;; editing inside multi-line optional argument sane.
+ (store-match-data (list beg-of-begin end beg end))
t)))
(defun font-latex-match-dollar-math (limit)
- [AUCTeX-diffs] [elpa] externals/auctex updated (1006b89 -> 1e8a495), Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex b45bf4d 07/27: Ignore 3 consective $'s properly, Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex 1685a67 01/27: * doc/changes.texi (News in 12.3): Add news about fix of bug#33139., Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex 7a1ebbf 08/27: Add support for algorithm style, Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex e5090c2 02/27: Complement document, Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex 393fb21 15/27: * texmathp.el: Add comment about additional bug., Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex a6b12a2 16/27: Update documents, Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex 32ad0e2 04/27: Obsolete font-latex-update-font-lock (bug#37945), Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex 3a809a9 18/27: Fix regression of font lock,
Tassilo Horn <=
- [AUCTeX-diffs] [elpa] externals/auctex ababc71 14/27: Recover compatibility for older emacsen, Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex 0ec28c6 13/27: Reconsider region extension, Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex d9e148b 26/27: Merge remote-tracking branch 'origin/master' into externals/auctex, Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex 3d4f378 17/27: Fix typos, Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex e62ce38 12/27: Merge branch 'obsolete-font-latex-update-font-lock', Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex 1855efd 21/27: ; * style/mathtools.el: A bit change to align with previous commit., Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex 3c1f820 25/27: Add TODO item about remove-style feature, Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex 1e8a495 27/27: Regenerate docs and tex-site.el after merge, Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex 4c0d150 22/27: Don't call TeX-remove-style in TeX-arg-document., Tassilo Horn, 2020/06/27
- [AUCTeX-diffs] [elpa] externals/auctex 0079026 19/27: ; * tests/latex/fontification-general.tex: Fix Indentation in environments., Tassilo Horn, 2020/06/27