diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-03-08 00:04:30 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-03-08 00:04:30 -0800 |
| commit | 37d2e431f35492c14510f9960cac94c2f21b6ecb (patch) | |
| tree | 4b72d5e8860ac1115c04d9a6de5a82f81867c4c0 /lisp/org | |
| parent | eb1a6e153a556de71886eb0d3f4deb7e6674c35c (diff) | |
| parent | f186a0b537dfec9991dff2674888d119bdff049b (diff) | |
| download | emacs-37d2e431f35492c14510f9960cac94c2f21b6ecb.tar.gz | |
Merge from emacs-24; up to 2012-12-25T15:07:59Z!dmantipov@yandex.ru
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/org/org-exp.el | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 5626b611f0d..1bf6fe315c1 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -1,3 +1,9 @@ +2013-03-08 Bastien Guerry <bzg@gnu.org> + + * org-exp.el (org-export-normalize-links): Fix critical bug: do + not rely on `org-context' to guess where to prevent links + normalization. + 2013-02-28 Achim Gratz <Stromeko@Stromeko.DE> * org.el (org-org-menu): Use correct key "C-u C-c C-x !" to do diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el index 5ccaec3e67f..82b9003e4fd 100644 --- a/lisp/org/org-exp.el +++ b/lisp/org/org-exp.el @@ -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) |