Merge branch 'maint'

2012-09-21 16:31:55 +02:00 · 2012-09-21 16:31:55 +02:00 · 99453a16f5
parent 0ac771f525 996a49dd44
commit 99453a16f5
1 changed files with 2 additions and 1 deletions
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@ -1180,7 +1180,8 @@ make this the default behavior.)"
 		  (cond ((and org-clock-heading-function
 			      (functionp org-clock-heading-function))
 			 (funcall org-clock-heading-function))
-			((looking-at org-complex-heading-regexp)
+			((and (looking-at org-complex-heading-regexp)
+			      (match-string 4))
 			 (replace-regexp-in-string
 			  "\\[\\[.*?\\]\\[\\(.*?\\)\\]\\]" "\\1"
 			  (match-string 4)))