Merge branch 'maint'

2016-01-24 11:25:30 +01:00 · 2016-01-24 11:25:30 +01:00 · 750e0f91a2
parent 9d39c9a2ba 860bcfbf93
commit 750e0f91a2
1 changed files with 4 additions and 1 deletions
--- a/lisp/org.el
+++ b/lisp/org.el
@ -5804,7 +5804,10 @@ prompted for."
  (let (f hl)
    (when (and (re-search-forward (concat org-plain-link-re) limit t)
 	       (not (member 'org-tag
-			    (get-text-property (1- (match-beginning 0)) 'face)))
+			    (get-text-property (cond
+                                                ((= 1 (match-beginning 0)) 1)
+                                                (t (1- (match-beginning 0))))
+                                               '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))