forked from mirrors/org-mode
Merge branch 'master' of code.orgmode.org:bzg/org-mode
This commit is contained in:
commit
a311f29db1
31
lisp/org.el
31
lisp/org.el
|
@ -6260,12 +6260,11 @@ done, nil otherwise."
|
||||||
(when (org-string-nw-p org-latex-and-related-regexp)
|
(when (org-string-nw-p org-latex-and-related-regexp)
|
||||||
(catch 'found
|
(catch 'found
|
||||||
(while (re-search-forward org-latex-and-related-regexp limit t)
|
(while (re-search-forward org-latex-and-related-regexp limit t)
|
||||||
(unless (cl-some
|
(unless (cl-some (lambda (f) (memq f '(org-code org-verbatim underline
|
||||||
(lambda (f) (memq f '(org-code org-verbatim underline
|
org-special-keyword)))
|
||||||
org-special-keyword)))
|
(save-excursion
|
||||||
(save-excursion
|
(goto-char (1+ (match-beginning 0)))
|
||||||
(goto-char (1+ (match-beginning 0)))
|
(face-at-point nil t)))
|
||||||
(face-at-point nil t)))
|
|
||||||
(let* ((start (if (memq (char-after (1+ (match-beginning 0)))
|
(let* ((start (if (memq (char-after (1+ (match-beginning 0)))
|
||||||
'(?_ ?^))
|
'(?_ ?^))
|
||||||
(1+ (match-beginning 0))
|
(1+ (match-beginning 0))
|
||||||
|
@ -6277,19 +6276,17 @@ done, nil otherwise."
|
||||||
(cond
|
(cond
|
||||||
((string-match "\\`[ \t]*\\\\begin{\\([a-zA-Z0-9\\*]+\\)}"
|
((string-match "\\`[ \t]*\\\\begin{\\([a-zA-Z0-9\\*]+\\)}"
|
||||||
m)
|
m)
|
||||||
(let ((closing
|
(let ((re (format "\\\\end{%s}[ \t]*$"
|
||||||
(format "\\\\end{%s}[ \t]*$"
|
(regexp-quote (match-string 1 m)))))
|
||||||
(regexp-quote (match-string 1 m)))))
|
(or (re-search-forward re nil t) e)))
|
||||||
(or (re-search-forward closing nil t) e)))
|
|
||||||
((string-match "\\\\end{\\([a-zA-Z0-9\\*]+\\)}[ \t]*\\'" m)
|
((string-match "\\\\end{\\([a-zA-Z0-9\\*]+\\)}[ \t]*\\'" m)
|
||||||
(let ((opening
|
(let ((re (format "^[ \t]*\\\\begin{%s}"
|
||||||
(format "^[ \t]*\\\\begin{%s}"
|
(regexp-quote (match-string 1 m)))))
|
||||||
(regexp-quote (match-string 1 m)))))
|
(setq start
|
||||||
(setq start (or (save-excursion
|
(or (save-excursion (re-search-backward re nil t))
|
||||||
(re-search-backward opening nil t))
|
b))
|
||||||
b))
|
|
||||||
(line-end-position)))
|
(line-end-position)))
|
||||||
((string-match "\\\\[a-zA-Z]+\\*?{" m)
|
((string-match "\\`\\\\[a-zA-Z]+\\*?{\\'" m)
|
||||||
(search-forward "}" nil t))
|
(search-forward "}" nil t))
|
||||||
(t e)))))
|
(t e)))))
|
||||||
(font-lock-prepend-text-property
|
(font-lock-prepend-text-property
|
||||||
|
|
Loading…
Reference in a new issue