>From 52e4c5e1e69b0aaef1795289d8cf9456e76716f1 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou
Date: Sat, 18 Nov 2017 00:19:35 +0100
Subject: [PATCH] Small fix to emphasis fontification
* lisp/org.el (org-do-emphasis-faces): Do not span over paragraph
separators.
Reported-by: Kaushal Modi
---
lisp/org.el | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index f873f1021..861ce31db 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5705,20 +5705,16 @@ This should be called after the variable `org-link-parameters' has changed."
(when (save-excursion
(goto-char (match-beginning 0))
(and
- ;; Do not match headline stars. Do not consider
- ;; stars of a headline as closing marker for bold
- ;; markup either.
- (not (and (equal marker "*")
- (save-excursion
- (forward-char)
- (skip-chars-backward "*")
- (looking-at-p org-outline-regexp-bol))))
;; Do not match table hlines.
(not (and (equal marker "+")
(org-match-line
- "^[ \t]*\\(|[-+]+|?\\|\\+[-+]+\\+\\)[ \t]*$")))
+ "[ \t]*\\(|[-+]+|?\\|\\+[-+]+\\+\\)[ \t]*$")))
+ ;; Match full emphasis markup regexp.
(looking-at (if verbatim? org-verbatim-re org-emph-re))
- ;; At a table row, do not cross cell boundaries.
+ ;; Do not span over paragraph boundaries.
+ (not (string-match-p org-element-paragraph-separate
+ (match-string 2)))
+ ;; Do not span over cells in table rows.
(not (and (save-match-data (org-match-line "[ \t]*|"))
(string-match-p "|" (match-string 4))))))
(pcase-let ((`(,_ ,face ,_) (assoc marker org-emphasis-alist)))
--
2.14.3