From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jason Riedy <ejr@EECS.Berkeley.EDU>
Subject: [Orgmode] [PATCH] Distinguish between TEST todo tag and TESTING
 header
Date: Wed, 06 Sep 2006 16:08:31 -0700
Message-ID: <21258.1157584111@lotus.CS.Berkeley.EDU>
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1GL6VX-0004Ly-HT
	for emacs-orgmode@gnu.org; Wed, 06 Sep 2006 19:08:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1GL6VW-0004LA-Np
	for emacs-orgmode@gnu.org; Wed, 06 Sep 2006 19:08:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1GL6VW-0004L7-LB
	for emacs-orgmode@gnu.org; Wed, 06 Sep 2006 19:08:34 -0400
Received: from [128.32.36.222] (helo=lotus.CS.Berkeley.EDU)
	by monty-python.gnu.org with esmtp (Exim 4.52) id 1GL6Vl-0003jh-KO
	for emacs-orgmode@gnu.org; Wed, 06 Sep 2006 19:08:49 -0400
Received: from lotus.CS.Berkeley.EDU (localhost [127.0.0.1])
	by lotus.CS.Berkeley.EDU (8.12.8/8.12.8/3.141592645) with ESMTP id
	k86N8WS0021260
	for <emacs-orgmode@gnu.org>; Wed, 6 Sep 2006 16:08:32 -0700 (PDT)
Received: from lotus.CS.Berkeley.EDU (ejr@localhost)
	by lotus.CS.Berkeley.EDU (8.12.8/8.12.8/Submit) with ESMTP id
	k86N8WWB021259
	for <emacs-orgmode@gnu.org>; Wed, 6 Sep 2006 16:08:32 -0700 (PDT)
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org

For various reasons, I need both a TEST todo tag and a 
header named TESTING in the same document.  The current
org-mode correctly distinguishes between them internally,
but not for export.

The appended patch works for me with a recent Emacs
snapshot, but my org-mode uses are pretty trivial (for now).
I don't have a wide variety of cases to test against.

Jason
---

--- org.el.orig	2006-09-06 15:31:20.000000000 -0700
+++ org.el	2006-09-06 15:31:08.000000000 -0700
@@ -2806,15 +2806,15 @@
 			     "\\|")
 		  "\\)\\>")
 	  org-todo-line-regexp
-	  (concat "^\\(\\*+\\)[ \t]*\\("
+	  (concat "^\\(\\*+\\)[ \t]*\\(?:\\("
 		  (mapconcat 'regexp-quote org-todo-keywords "\\|")
-		  "\\)? *\\(.*\\)")
+		  "\\)\\>\\)? *\\(.*\\)")
 	  org-nl-done-regexp
 	  (concat "[\r\n]\\*+[ \t]+" org-done-string "\\>")
 	  org-todo-line-tags-regexp
-	  (concat "^\\(\\*+\\)[ \t]*\\("
+	  (concat "^\\(\\*+\\)[ \t]*\\(?:\\("
 		  (mapconcat 'regexp-quote org-todo-keywords "\\|")
-		  "\\)? *\\(.*?\\([ \t]:[a-zA-Z0-9:_@]+:[ \t]*\\)?$\\)")
+		  "\\)\\>\\)? *\\(.*?\\([ \t]:[a-zA-Z0-9:_@]+:[ \t]*\\)?$\\)")
 	  org-looking-at-done-regexp (concat "^" org-done-string "\\>")
 	  org-deadline-regexp (concat "\\<" org-deadline-string)
 	  org-deadline-time-regexp