Finalize the relative-timer setup.

This cleans up the implementation of the timer.  Most important change
is that, after starting a time list with `C-c C-x -', you can then
simply use M-RET to add new items, which is addictive!

ORGWEBPAGE/Changes.org

@@ -34,6 +34,10 @@
       Insert a description list item with the current relative
       time.  With a prefix argument, first reset the timer to 0.
 
+    - =M-RET= ::
+      Once the time list has been initiated, you can also use the
+      normal item-creating command to insert the next timer item.
+
     - =C-c C-x 0= :: 
       Reset the timer without inserting anything into the buffer.
       By default, the timer is reset to 0.  When called with a

doc/org.texi

@@ -4956,6 +4956,10 @@ restarted.
 @item C-c C-x -
 Insert a description list item with the current relative time.  With a prefix
 argument, first reset the timer to 0.
+@kindex M-@key{RET}
+@item M-@key{RET}
+One the timer list is started, you can also use @kbd{M-@key{RET}} to insert
+new timer items.
 @kindex C-c C-x 0
 @item C-c C-x 0
 Reset the timer without inserting anything into the buffer.  By default, the

lisp/ChangeLog

@@ -1,5 +1,11 @@
 2008-11-25  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-timer.el (org-timer-start-time): Define this variable.
+	(org-timer-item): Make argument optional.
+
+	* org-list.el (org-insert-item): Automatically insert a timer item
+	if the current list is a timer list.
+
 	* org-timer.el: New file.
 
 	* org-publish.el (org-publish-org-index): Only exclude the index

lisp/org-list.el

@@ -185,35 +185,42 @@ Return t when things worked, nil when we are not in an item."
 	   (descp (save-excursion (goto-char (match-beginning 0))
 				  (beginning-of-line 1)
 				  (save-match-data
-				    (looking-at "[ \t]*.*? ::"))))
+				    (and (looking-at "[ \t]*\\(.*?\\) ::")
+					 (match-string 1)))))
+	   (timerp (and descp 
+			(save-match-data
+			  (string-match "^[-+*][ \t]+[0-9]+:[0-9]+:[0-9]+$"
+					descp))))
 	   (eow (save-excursion (beginning-of-line 1) (looking-at "[ \t]*")
 				(match-end 0)))
 	   (blank (cdr (assq 'plain-list-item org-blank-before-new-entry)))
 	   pos)
       (if descp (setq checkbox nil))
-      (cond
-       ((and (org-at-item-p) (<= (point) eow))
-	;; before the bullet
-	(beginning-of-line 1)
-	(open-line (if blank 2 1)))
-       ((<= (point) eow)
-	(beginning-of-line 1))
-       (t
-	(unless (org-get-alist-option org-M-RET-may-split-line 'item)
-	  (end-of-line 1)
-	  (delete-horizontal-space))
-	(newline (if blank 2 1))))
-      (insert bul
-	      (if checkbox "[ ]" "")
-	      (if descp (concat (if checkbox " " "")
-				(read-string "Term: ") " :: ") ""))
-      (just-one-space)
-      (setq pos (point))
-      (end-of-line 1)
-      (unless (= (point) pos) (just-one-space) (backward-delete-char 1)))
-    (org-maybe-renumber-ordered-list)
-    (and checkbox (org-update-checkbox-count-maybe))
-    t))
+      (if timerp
+	  (progn (org-timer-item) t)
+	(cond
+	 ((and (org-at-item-p) (<= (point) eow))
+	  ;; before the bullet
+	  (beginning-of-line 1)
+	  (open-line (if blank 2 1)))
+	 ((<= (point) eow)
+	  (beginning-of-line 1))
+	 (t
+	  (unless (org-get-alist-option org-M-RET-may-split-line 'item)
+	    (end-of-line 1)
+	    (delete-horizontal-space))
+	  (newline (if blank 2 1))))
+	(insert bul
+		(if checkbox "[ ]" "")
+		(if descp (concat (if checkbox " " "")
+				  (read-string "Term: ") " :: ") ""))
+	(just-one-space)
+	(setq pos (point))
+	(end-of-line 1)
+	(unless (= (point) pos) (just-one-space) (backward-delete-char 1)))
+      (org-maybe-renumber-ordered-list)
+      (and checkbox (org-update-checkbox-count-maybe))
+      t)))
 
 ;;; Checkboxes
 

lisp/org-timer.el

@@ -27,6 +27,9 @@
 
 ;; This file contains the relative timer code for Org-mode
 
+(defvar org-timer-start-time nil
+  "t=0 for the running timer.")
+
 (defconst org-timer-re "\\([-+]?[0-9]+\\):\\([0-9]\\{2\\}\\):\\([0-9]\\{2\\}\\)"
   "Regular expression used to match timer stamps.")
 
@@ -119,7 +122,7 @@ that was not started at the correct moment."
 	(goto-char p)))))
 
 ;;;###autoload
-(defun org-timer-item (arg)
+(defun org-timer-item (&optional arg)
   "Insert a description-type item with the curren timer value."
   (interactive "P")
   (let ((ind 0))