Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

ChangeLog

@@ -1,3 +1,9 @@
+2008-02-09  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org.el (org-cleaned-string-for-export): Get rid of drawers
+	first, so that they will be removed also in the text before the
+	first headline.
+
 2008-02-08  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.el (org-clock-report): Show the clocktable when found.

org.el

@@ -23887,6 +23887,19 @@ translations.  There is currently no way for users to extend this.")
       (let ((org-inhibit-startup t)) (org-mode))
       (untabify (point-min) (point-max))
 
+      ;; Get rid of drawers
+      (unless (eq t exp-drawers)
+	(goto-char (point-min))
+	(let ((re (concat "^[ \t]*:\\("
+			  (mapconcat
+			   'identity
+			   (org-delete-all exp-drawers
+					   (copy-sequence drawers))
+			   "\\|")
+			  "\\):[ \t]*\n\\([^@]*?\n\\)?[ \t]*:END:[ \t]*\n")))
+	  (while (re-search-forward re nil t)
+	    (replace-match ""))))
+
       ;; Get the correct stuff before the first headline
       (when (plist-get parameters :skip-before-1st-heading)
 	(goto-char (point-min))
@@ -23910,19 +23923,6 @@ translations.  There is currently no way for users to extend this.")
 		  b (org-end-of-subtree t))
 	    (if (> b a) (delete-region a b)))))
 
-      ;; Get rid of drawers
-      (unless (eq t exp-drawers)
-	(goto-char (point-min))
-	(let ((re (concat "^[ \t]*:\\("
-			  (mapconcat
-			   'identity
-			   (org-delete-all exp-drawers
-					   (copy-sequence drawers))
-			   "\\|")
-			  "\\):[ \t]*\n\\([^@]*?\n\\)?[ \t]*:END:[ \t]*\n")))
-	  (while (re-search-forward re nil t)
-	    (replace-match ""))))
-
       ;; Find targets in comments and move them out of comments,
       ;; but mark them as targets that should be invisible
       (goto-char (point-min))