Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-02-13 11:38:28 +01:00
commit 990385e7a3
1 changed files with 1 additions and 2 deletions

View File

@ -2113,8 +2113,7 @@ 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 (or (get-text-property (match-beginning 0) 'org-normalized-link)
(assoc :tags (org-context)))
(unless (get-text-property (match-beginning 0) 'org-normalized-link)
(goto-char (1- (match-end 0)))
(org-if-unprotected-at (1+ (match-beginning 0))
(let* ((s (concat (match-string 1)