summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-02-04 22:03:48 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-02-04 22:03:48 (GMT)
commit60b13f3dfe19e49f99a580db111112280b326095 (patch)
treee968fd51bca3b81a8698fbf86ebe9379e4624cb5
parent9ca48c15e1e21419a85e04ec1c034dac2f5d7609 (diff)
parent80cb1b0a09f53ae9a6dd37c7884ec6a26e29e12c (diff)
downloadorg-mode-60b13f3dfe19e49f99a580db111112280b326095.zip
org-mode-60b13f3dfe19e49f99a580db111112280b326095.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-exp.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 40f90c2..4296c2c 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -2119,7 +2119,8 @@ Also, store forced alignment information found in such lines."
(put-text-property (match-beginning 0) (match-end 0) 'org-normalized-link t))
(goto-char (point-min))
(while (re-search-forward re-plain-link nil t)
- (unless (get-text-property (match-beginning 0) 'org-normalized-link)
+ (unless (or (get-text-property (match-beginning 0) 'org-normalized-link)
+ (assoc :tags (org-context)))
(goto-char (1- (match-end 0)))
(org-if-unprotected-at (1+ (match-beginning 0))
(let* ((s (concat (match-string 1)