Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Conflicts:
	lisp/ChangeLog

lisp/ChangeLog

@@ -17,6 +17,11 @@
 	* org-compat.el (org-overlays-at): Function removed.
 	(org-overlays-in): Function removed.
 
+2010-04-19  Bastien Guerry  <bzg@altern.org>
+
+	* org-clock.el (org-clock-set-current): Just return the headline
+	itself, strip the TODO keyword, the priority cookie and the tags.
+
 2010-04-18  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-compat.el (org-xemacs-without-invisibility): New macro.

lisp/org-clock.el

@@ -1058,7 +1058,7 @@ the clocking selection, associated with the letter `d'."
   "Task currently clocked in.")
 (defun org-clock-set-current ()
   "Set `org-clock-current-task' to the task currently clocked in."
-  (setq org-clock-current-task (org-get-heading)))
+  (setq org-clock-current-task (nth 4 (org-heading-components))))
 (defun org-clock-delete-current ()
   "Reset `org-clock-current-task' to nil."
   (setq org-clock-current-task nil))