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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-01-24 18:23:58 +01:00
parent c10ba5f3dc 8e74ea3d10
commit 53472b9c44
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org.el
View File

@ -5803,11 +5803,9 @@ prompted for."
"Add link properties for plain links." "Add link properties for plain links."
(let (f hl) (let (f hl)
(when (and (re-search-forward (concat org-plain-link-re) limit t) (when (and (re-search-forward (concat org-plain-link-re) limit t)
(not (member 'org-tag (not (memq 'org-tag
(get-text-property (cond (get-text-property
((= 1 (match-beginning 0)) 1) (max (1- (match-beginning 0)) (point-min)) 'face)))
(t (1- (match-beginning 0))))
'face)))
(not (org-in-src-block-p))) (not (org-in-src-block-p)))
(org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0)) (org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0))
(setq f (get-text-property (match-beginning 0) 'face)) (setq f (get-text-property (match-beginning 0) 'face))