org-choose: Apply Tom's patch

contrib/ChangeLog

@@ -1,3 +1,8 @@
+2009-02-13  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* lisp/org-choose.el (org-choose-get-fn-map-group): Require
+	`org-agenda'.
+
 2009-02-12  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* lisp/org-choose.el ("org"): Use file name instead of feature for

contrib/lisp/org-choose.el

@@ -273,7 +273,6 @@ interpretation."
 (defun org-choose-keep-sensible (change-plist)
   "Bring the other items back into a sensible state after an item's
 setting was changed."
-
    (let*
       (  (from (plist-get change-plist :from))
 	 (to (plist-get change-plist :to))
@@ -385,6 +384,7 @@ setting was changed."
    "Return a function to map over the group"
    
    #'(lambda (fn)
+       (require 'org-agenda) ;; `org-map-entries' seems to need it.
 	(save-excursion
 	  (unless (org-up-heading-safe)
 	    (error "Chosing is only supported between siblings in a tree, not on top level"))
@@ -421,7 +421,6 @@ If there is none, return 0"
 given that another mark has index IX.
 DATA must be a `org-choose-mark-data.'."
 
-
    (let
       (		
 	 (bot-lower-range