--- org-mouse.el.orig	Tue Apr  3 17:55:10 2007
+++ org-mouse.el	Tue Apr  3 17:58:24 2007
@@ -548,6 +548,9 @@
 	(set-match-data ',match)
 	(apply ',function rest)))))
 
+(defun org-mouse-todo-keywords ()
+  (if (boundp 'org-todo-keywords-1) org-todo-keywords-1 org-todo-keywords))
+
 (defun org-mouse-match-todo-keyword ()
   (save-excursion
     (org-back-to-heading)
@@ -616,10 +619,10 @@
 			 (org-mouse-remove-match-and-spaces))))]
        )))
    ((and (org-mouse-looking-at "\\b\\w+" "a-zA-Z0-9_")
- 	 (member (match-string 0) org-todo-keywords))
+ 	 (member (match-string 0) (org-mouse-todo-keywords)))
     (popup-menu 
      `(nil
-       ,@(org-mouse-keyword-replace-menu org-todo-keywords)
+       ,@(org-mouse-keyword-replace-menu (org-mouse-todo-keywords))
        "--" 
        ["Check TODOs" org-show-todo-tree t]
        ["List all TODO keywords" org-todo-list t]
@@ -758,7 +761,8 @@
 	  ,@(org-mouse-tag-menu))
 	 ("TODO Status"
 	  ,@(progn (org-mouse-match-todo-keyword)
-		   (org-mouse-keyword-replace-menu org-todo-keywords 1)))
+		   (org-mouse-keyword-replace-menu (org-mouse-todo-keywords)
+						   1)))
 	 ["Show Tags" 
 	  (with-current-buffer org-mouse-main-buffer (org-agenda-show-tags))
 	  :visible (not org-mouse-direct)]
@@ -1027,7 +1031,6 @@
 	 ["Quit" org-agenda-quit t]
 	 ["Exit and Release Buffers" org-agenda-exit t]
 	 ))))
-
 
 (defun org-mouse-get-gesture (event)
   (let ((startxy (posn-x-y (event-start event)))