[Emacs-diffs] /srv/bzr/emacs/emacs-24 r111325: Fix critical bug in Org.

[Bastien Guerry]

------------------------------------------------------------
revno: 111325
committer: Bastien Guerry <address@hidden>
branch nick: emacs-24
timestamp: Fri 2013-03-08 07:37:21 +0100
message:
  Fix critical bug in Org.
modified:
  lisp/org/ChangeLog
  lisp/org/org-exp.el

=== modified file 'lisp/org/ChangeLog'
--- a/lisp/org/ChangeLog        2013-02-28 00:31:26 +0000
+++ b/lisp/org/ChangeLog        2013-03-08 06:37:21 +0000
@@ -1,3 +1,9 @@
+2013-03-08  Bastien Guerry  <address@hidden>
+
+       * 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  <address@hidden>
 
        * org.el (org-org-menu): Use correct key "C-u C-c C-x !" to do

=== modified file 'lisp/org/org-exp.el'
--- a/lisp/org/org-exp.el       2013-02-07 07:11:59 +0000
+++ b/lisp/org/org-exp.el       2013-03-08 06:37:21 +0000
@@ -2113,8 +2113,7 @@
       (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)