cd /home/tehom/emacs-site-lisp/built/org-6.25d/contrib/lisp/
diff -c /home/tehom/emacs-site-lisp/built/org-6.24c/contrib/lisp/org-choose.el /home/tehom/emacs-site-lisp/built/org-6.25d/contrib/lisp/org-choose.el
*** /home/tehom/emacs-site-lisp/built/org-6.24c/contrib/lisp/org-choose.el	2009-04-06 16:11:42.000000000 -0400
--- /home/tehom/emacs-site-lisp/built/org-6.25d/contrib/lisp/org-choose.el	2009-04-08 20:02:37.000000000 -0400
***************
*** 235,244 ****
     
     (unless
        ;;Skip the entry that triggered this by skipping any entry with
!       ;;the same starting position.  Both map and plist use the start
!       ;;of the header line as the position, so we can just compare
!       ;;them with `='
!       (= (point) entry-pos)
        (let
  	 ((ix
  	     (org-choose-get-entry-index keywords)))
--- 235,248 ----
     
     (unless
        ;;Skip the entry that triggered this by skipping any entry with
!       ;;the same starting position.  plist uses the start of the
!       ;;header line as the position, but map no longer does, so we
!       ;;have to go back to the heading.
!       (= 
! 	 (save-excursion
! 	    (org-back-to-heading)
! 	    (point)) 
! 	 entry-pos)
        (let
  	 ((ix
  	     (org-choose-get-entry-index keywords)))
***************
*** 256,262 ****
  
     (unless
        ;;Skip the entry that triggered this.
!       (= (point) entry-pos)
        (let
  	 ((ix
  	     (org-choose-get-entry-index keywords)))
--- 260,270 ----
  
     (unless
        ;;Skip the entry that triggered this.
!       (= 
! 	 (save-excursion
! 	    (org-back-to-heading)
! 	    (point))
! 	 entry-pos)
        (let
  	 ((ix
  	     (org-choose-get-entry-index keywords)))
***************
*** 390,396 ****
  	  (unless (org-up-heading-safe)
  	    (error "Choosing is only supported between siblings in a tree, not on top level"))
  	  (let
!  	      ((level (1+ (org-reduced-level (org-outline-level)))))
  	    (save-restriction
  	      (org-map-entries 
  	       fn
--- 398,404 ----
  	  (unless (org-up-heading-safe)
  	    (error "Choosing is only supported between siblings in a tree, not on top level"))
  	  (let
!  	      ((level (org-reduced-level (org-outline-level))))
  	    (save-restriction
  	      (org-map-entries 
  	       fn

Diff finished at Wed Apr  8 20:02:54