mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-15 21:09:54 +00:00
Merge branch 'maint'
This commit is contained in:
commit
a959d23201
|
@ -1199,13 +1199,8 @@ make this the default behavior.)"
|
|||
(goto-char target-pos)
|
||||
(org-back-to-heading t)
|
||||
(or interrupting (move-marker org-clock-interrupted-task nil))
|
||||
(save-excursion
|
||||
(forward-char) ;; make sure the marker is not at the
|
||||
;; 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))
|
||||
(run-hooks 'org-clock-in-prepare-hook)
|
||||
(org-clock-history-push)
|
||||
(setq org-clock-current-task (nth 4 (org-heading-components)))
|
||||
(cond ((functionp org-clock-in-switch-to-state)
|
||||
(looking-at org-complex-heading-regexp)
|
||||
|
|
Loading…
Reference in a new issue