ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into next

This commit is contained in:
Nicolas Goaziou 2018-10-14 09:58:55 +02:00
parent 4d8c78a0ef f12f9b4f28
commit 9d6a9e1739
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org.el
View File

@ -5654,7 +5654,9 @@ This should be called after the variable `org-link-parameters' has changed."
(match-beginning 2) (match-end 2) 'face face) (match-beginning 2) (match-end 2) 'face face)
(when verbatim? (when verbatim?
(org-remove-flyspell-overlays-in (org-remove-flyspell-overlays-in
(match-beginning 0) (match-end 0))) (match-beginning 0) (match-end 0))
(remove-text-properties (match-beginning 2) (match-end 2)
'(display t invisible t intangible t)))
(add-text-properties (match-beginning 2) (match-end 2) (add-text-properties (match-beginning 2) (match-end 2)
'(font-lock-multiline t org-emphasis t)) '(font-lock-multiline t org-emphasis t))
(when org-hide-emphasis-markers (when org-hide-emphasis-markers