mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-15 21:09:54 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Bastien Guerry 2013-04-24 10:47:30 +02:00
parent 8c1f16d475 3dd3100794
commit a959d23201
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/org-clock.el
View file

@ -1199,13 +1199,8 @@ make this the default behavior.)"
(goto-char target-pos) (goto-char target-pos)
(org-back-to-heading t) (org-back-to-heading t)
(or interrupting (move-marker org-clock-interrupted-task nil)) (or interrupting (move-marker org-clock-interrupted-task nil))
(save-excursion (run-hooks 'org-clock-in-prepare-hook)
(forward-char) ;; make sure the marker is not at the (org-clock-history-push)
;; beginning of the heading, since the
;; user is liking to insert stuff here
;; manually
(run-hooks 'org-clock-in-prepare-hook)
(org-clock-history-push))
(setq org-clock-current-task (nth 4 (org-heading-components))) (setq org-clock-current-task (nth 4 (org-heading-components)))
(cond ((functionp org-clock-in-switch-to-state) (cond ((functionp org-clock-in-switch-to-state)
(looking-at org-complex-heading-regexp) (looking-at org-complex-heading-regexp)