Merge branch 'maint'

Conflicts:
	lisp/org-clock.el

lisp/org-clock.el

@@ -1855,14 +1855,15 @@ Use \\[org-clock-remove-overlays] to remove the subtree times."
 This creates a new overlay and stores it in `org-clock-overlays', so that it
 will be easy to remove."
   (let* ((c 60) (h (floor (/ time 60))) (m (- time (* 60 h)))
-	 (off 0)
 	 ov tx)
     (org-move-to-column c)
     (unless (eolp) (skip-chars-backward "^ \t"))
     (skip-chars-backward " \t")
-    (setq ov (make-overlay (point-at-bol) (point-at-eol))
-    	  tx (concat (buffer-substring (point-at-bol) (point))
-		     (make-string (+ off (max 0 (- c (current-column)))) ?.)
+    (setq ov (make-overlay (1- (point-at-eol)) (point-at-eol))
+    	  tx (concat (buffer-substring (1- (point)) (point))
+		     (make-string
+		      (max 0 (- (- c (current-column))
+				(length (org-get-at-bol 'line-prefix)))) ?.)
 		     (org-add-props
 			 (concat " " (org-minutes-to-clocksum-string time) " ")
 			 (list 'face 'org-clock-overlay))