Bug fixes.

ORGWEBPAGE/Changes.org

@@ -150,7 +150,7 @@
     You may set these tags with in-buffer options
     =EXPORT_SELECT_TAGS= and =EXPORT_EXCLUDE_TAGS=.
 
-    I love this feature.  Thanks to Richard G Rigley for coming
+    I love this feature.  Thanks to Richard G Riley for coming
     up with the idea.
 
 *** Prefix interpretation when storing remember notes
@@ -222,7 +222,7 @@
 
 *** New face =org-scheduled= for entries scheduled in the future.
 
-    This was a request by Richard G Rigley.
+    This was a request by Richard G Riley.
 
 *** Remember templates for gnus links can now use the :to escape.
 

lisp/ChangeLog

@@ -1,5 +1,8 @@
 2008-09-19  Carsten Dominik  <dominik@science.uva.nl>
 
+	* org-agenda.el (org-agenda-highlight-todo): Fix bugs with keyword
+	matching.
+
 	* org.el (org-scan-tags): Make sure that tags matching is not case
 	sensitive.  TODO keyword matching is case sensitive, however, to
 	avoid confusion with similar words that are not meant to be

lisp/org-agenda.el

@@ -3858,15 +3858,16 @@ HH:MM."
     (mapconcat 'identity (sort list 'org-entries-lessp) "\n")))
 
 (defun org-agenda-highlight-todo (x)
-  (let (re pl)
+  (let ((org-done-keywords org-done-keywords-for-agenda)
+	 re pl)
     (if (eq x 'line)
 	(save-excursion
 	  (beginning-of-line 1)
 	  (setq re (get-text-property (point) 'org-todo-regexp))
 	  (goto-char (+ (point) (or (get-text-property (point) 'prefix-length) 0)))
-	  (when (looking-at (concat "[ \t]*\\.*" re " +"))
+	  (when (looking-at (concat "[ \t]*\\.*\\(" re "\\) +"))
 	    (add-text-properties (match-beginning 0) (match-end 0)
-				 (list 'face (org-get-todo-face 0)))
+				 (list 'face (org-get-todo-face 1)))
 	    (let ((s (buffer-substring (match-beginning 1) (match-end 1))))
 	      (delete-region (match-beginning 1) (1- (match-end 0)))
 	      (goto-char (match-beginning 1))