Merge branch 'maint'

lisp/org-clock.el

@@ -667,22 +667,21 @@ If an effort estimate was defined for the current item, use
 01:30/01:50 format (clocked/estimated).
 If not, show simply the clocked time like 01:50."
   (let ((clocked-time (org-clock-get-clocked-time)))
-    (propertize
-     (if org-clock-effort
-	 (let* ((effort-in-minutes (org-duration-to-minutes org-clock-effort))
-		(work-done-str
-		 (propertize (org-duration-from-minutes clocked-time)
-			     'face
-			     (if (and org-clock-task-overrun
-				      (not org-clock-task-overrun-text))
-				 'org-mode-line-clock-overrun
-			       'org-mode-line-clock)))
-		(effort-str (org-duration-from-minutes effort-in-minutes)))
-	   (format " [%s/%s] (%s)" work-done-str effort-str org-clock-heading))
-       (format " [%s] (%s)"
-	       (org-duration-from-minutes clocked-time)
-	       org-clock-heading))
-     'face 'org-mode-line-clock)))
+    (if org-clock-effort
+	(let* ((effort-in-minutes (org-duration-to-minutes org-clock-effort))
+	       (work-done-str
+		(propertize (org-duration-from-minutes clocked-time)
+			    'face
+			    (if (and org-clock-task-overrun
+				     (not org-clock-task-overrun-text))
+				'org-mode-line-clock-overrun
+			      'org-mode-line-clock)))
+	       (effort-str (org-duration-from-minutes effort-in-minutes)))
+	  (format (propertize " [%s/%s] (%s)" 'face 'org-mode-line-clock)
+		  work-done-str effort-str org-clock-heading))
+      (format (propertize " [%s] (%s)" 'face 'org-mode-line-clock)
+	      (org-duration-from-minutes clocked-time)
+	      org-clock-heading))))
 
 (defun org-clock-get-last-clock-out-time ()
   "Get the last clock-out time for the current subtree."