Browse Source

Merge branch 'master' of code.orgmode.org:bzg/org-mode

Bastien 1 year ago
parent
commit
a311f29db1
1 changed files with 14 additions and 17 deletions
  1. 14 17
      lisp/org.el

+ 14 - 17
lisp/org.el

@@ -6260,12 +6260,11 @@ done, nil otherwise."
   (when (org-string-nw-p org-latex-and-related-regexp)
     (catch 'found
       (while (re-search-forward org-latex-and-related-regexp limit t)
-	(unless (cl-some
-		 (lambda (f) (memq f '(org-code org-verbatim underline
-					   org-special-keyword)))
-		 (save-excursion
-		   (goto-char (1+ (match-beginning 0)))
-		   (face-at-point nil t)))
+	(unless (cl-some (lambda (f) (memq f '(org-code org-verbatim underline
+						   org-special-keyword)))
+			 (save-excursion
+			   (goto-char (1+ (match-beginning 0)))
+			   (face-at-point nil t)))
 	  (let* ((start (if (memq (char-after (1+ (match-beginning 0)))
 				  '(?_ ?^))
 			    (1+ (match-beginning 0))
@@ -6277,19 +6276,17 @@ done, nil otherwise."
 		    (cond
 		     ((string-match "\\`[ \t]*\\\\begin{\\([a-zA-Z0-9\\*]+\\)}"
 				    m)
-		      (let ((closing
-			     (format "\\\\end{%s}[ \t]*$"
-				     (regexp-quote (match-string 1 m)))))
-			(or (re-search-forward closing nil t) e)))
+		      (let ((re (format "\\\\end{%s}[ \t]*$"
+					(regexp-quote (match-string 1 m)))))
+			(or (re-search-forward re nil t) e)))
 		     ((string-match "\\\\end{\\([a-zA-Z0-9\\*]+\\)}[ \t]*\\'" m)
-		      (let ((opening
-			     (format "^[ \t]*\\\\begin{%s}"
-				     (regexp-quote (match-string 1 m)))))
-			(setq start (or (save-excursion
-					  (re-search-backward opening nil t))
-					b))
+		      (let ((re (format "^[ \t]*\\\\begin{%s}"
+					(regexp-quote (match-string 1 m)))))
+			(setq start
+			      (or (save-excursion (re-search-backward re nil t))
+				  b))
 			(line-end-position)))
-		     ((string-match "\\\\[a-zA-Z]+\\*?{" m)
+		     ((string-match "\\`\\\\[a-zA-Z]+\\*?{\\'" m)
 		      (search-forward "}" nil t))
 		     (t e)))))
 	    (font-lock-prepend-text-property