Merge branch 'maint'

2016-01-24 18:23:58 +01:00 · 2016-01-24 18:23:58 +01:00 · 53472b9c44
parent c10ba5f3dc 8e74ea3d10
commit 53472b9c44
1 changed files with 3 additions and 5 deletions
--- 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))