2009-02-06 Carsten Dominik <dominik@science.uva.nl>

	* org-exp.el (org-export-remove-or-extract-drawers): Fix
	regular expression for extracting drawers.

diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index f36f07ae273abf13f6629cba602c90bf8fc4e029..c0226589d45eb7b0865878db6ead4852a2938daf 100644 (file)
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -2,6 +2,8 @@
 
        * org-exp.el (org-export-preprocess-string): Fix bug with skipping
        text before first headline.
+       (org-export-remove-or-extract-drawers): Fix regular expression for
+       extracting drawers.
 
        * org.el (org-format-latex): Stop LaTeX fragment processing in
        protected examples.

diff --git a/lisp/org/org-exp.el b/lisp/org/org-exp.el
index cf94d5ee4334164d205e9608b4fffc295cf0ce4c..501e7620851918c9464488eb5321df61a33576ea 100644 (file)
--- a/lisp/org/org-exp.el
+++ b/lisp/org/org-exp.el
@@ -1751,7 +1751,7 @@ whose content to keep."
                       (org-delete-all exp-drawers
                                       (copy-sequence all-drawers))
                       "\\|")
-                     "\\):[ \t]*\n\\([^@]*?\n\\)?[ \t]*:END:[ \t]*\n")))
+                     "\\):[ \t]*\n\\([^\000]*?\n\\)?[ \t]*:END:[ \t]*\n")))
       (while (re-search-forward re nil t)
        (org-if-unprotected
         (replace-match ""))))))