From: Carsten Dominik <dominik@science.uva.nl>
Date: Fri, 6 Feb 2009 16:17:56 +0000 (+0000)
Subject: 2009-02-06  Carsten Dominik  <dominik@science.uva.nl>
X-Git-Tag: emacs-pretest-23.0.91~382
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7297ca6d3d497a31a0e90f381a33000a6ab0a187;p=emacs.git

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 f36f07ae273..c0226589d45 100644
--- 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 cf94d5ee433..501e7620851 100644
--- 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 ""))))))