Position items with relative timer at the right place.

* org-timer.el (org-timer-item): Insert description list item at the
  right column.
* org-list.el (org-insert-item): Insert the right number of blank
  lines before a relative timer.

lisp/org-list.el

@@ -664,8 +664,12 @@ block, or item is invisible."
 			 (unless before-p (org-move-item-down)))))
       (goto-char pos)
       (cond
-       ;; if we're adding a timer, delegate to `org-timer-item'.
-       (timer-p (org-timer-item) t)
+       ;; if we're adding a timer, delegate to `org-timer-item' after
+       ;; inserting a coherent number of blank lines.
+       (timer-p
+	(newline (1+ blank-lines-nb))
+	(org-timer-item)
+	t)
        (before-p
 	(funcall insert-fun)
 	;; Renumber in this case, as we're not moving down.

lisp/org-timer.el

@@ -195,14 +195,11 @@ that was not started at the correct moment."
 (defun org-timer-item (&optional arg)
   "Insert a description-type item with the current timer value."
   (interactive "P")
-  (let ((ind 0))
-    (save-excursion
-      (skip-chars-backward " \n\t")
-      (condition-case nil
-	  (progn
-	    (org-beginning-of-item)
-	    (setq ind (org-get-indentation)))
-	(error nil)))
+  (let ((ind (save-excursion
+	       (if (not (org-in-item-p))
+		   (org-indent-line-function)
+		 (org-beginning-of-item)
+		 (org-get-indentation)))))
     (or (bolp) (newline))
     (org-indent-line-to ind)
     (insert "- ")