summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2016-01-24 18:23:58 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2016-01-24 18:23:58 +0100
commit53472b9c44f49ae15877a1a0af78cfcb5a3d6043 (patch)
treea547e9759100b08131fd3becb94e8bbb0e5976e1
parentc10ba5f3dcc02bec1e3b6f0930768ba251369c55 (diff)
parent8e74ea3d1030bdcbcd02dfe8ae325340fd7b3dc3 (diff)
downloadorg-mode-53472b9c44f49ae15877a1a0af78cfcb5a3d6043.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el8
1 files changed, 3 insertions, 5 deletions
diff --git a/lisp/org.el b/lisp/org.el
index fd91375..bd17f6c 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5803,11 +5803,9 @@ prompted for."
"Add link properties for plain links."
(let (f hl)
(when (and (re-search-forward (concat org-plain-link-re) limit t)
- (not (member 'org-tag
- (get-text-property (cond
- ((= 1 (match-beginning 0)) 1)
- (t (1- (match-beginning 0))))
- 'face)))
+ (not (memq 'org-tag
+ (get-text-property
+ (max (1- (match-beginning 0)) (point-min)) 'face)))
(not (org-in-src-block-p)))
(org-remove-flyspell-overlays-in (match-beginning 0) (match-end 0))
(setq f (get-text-property (match-beginning 0) 'face))