0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-25 10:02:52 +00:00

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-09-21 16:31:55 +02:00
commit 99453a16f5

View file

@ -1180,7 +1180,8 @@ make this the default behavior.)"
(cond ((and org-clock-heading-function (cond ((and org-clock-heading-function
(functionp org-clock-heading-function)) (functionp org-clock-heading-function))
(funcall 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 (replace-regexp-in-string
"\\[\\[.*?\\]\\[\\(.*?\\)\\]\\]" "\\1" "\\[\\[.*?\\]\\[\\(.*?\\)\\]\\]" "\\1"
(match-string 4))) (match-string 4)))