mirror of
https://github.com/pestctrl/emacs-config.git
synced 2026-02-16 08:14:15 +00:00
No need for this code anymore
This commit is contained in:
parent
dbbd82581f
commit
db62e19e3d
1 changed files with 0 additions and 46 deletions
|
|
@ -344,55 +344,9 @@ https://github.com/org-trello/org-trello/issues/258
|
|||
(unless (org-clocking-p)
|
||||
(setq org-clock-current-task nil)))))))
|
||||
|
||||
(defun my/org-clock-resolve-clock
|
||||
(clock resolve-to clock-out-time close restart fail-quietly)
|
||||
"Resolve CLOCK given the time RESOLVE-TO, and the present.
|
||||
CLOCK is a cons cell of the form (MARKER START-TIME)."
|
||||
(let ((org-clock-resolving-clocks t)
|
||||
;; If the clocked entry contained only a clock and possibly
|
||||
;; the associated drawer, and we either cancel it or clock it
|
||||
;; out, `org-clock-out-remove-zero-time-clocks' may clear all
|
||||
;; contents, and leave point on the /next/ headline. We store
|
||||
;; the current entry location to be able to get back here when
|
||||
;; we need to clock in again the previously clocked task.
|
||||
(heading (org-with-point-at (car clock)
|
||||
(org-back-to-heading t)
|
||||
(point-marker))))
|
||||
(pcase resolve-to
|
||||
(`nil
|
||||
(org-clock-clock-cancel clock)
|
||||
(when (and restart (not org-clock-clocking-in))
|
||||
(org-with-point-at heading (org-clock-in))))
|
||||
(`now
|
||||
(cond
|
||||
(restart (error "RESTART is not valid here"))
|
||||
((or close org-clock-clocking-in)
|
||||
(org-clock-clock-out clock fail-quietly))
|
||||
((org-is-active-clock clock) nil)
|
||||
(t (org-clock-clock-in clock t))))
|
||||
((pred (time-less-p (current-time)))
|
||||
;; ^ NOTE: Here and in other `time-less-p' calls, we use
|
||||
;; (current-time) rather than nil for Emacs 24 compatibility.
|
||||
(error "RESOLVE-TO must refer to a time in the past"))
|
||||
(_
|
||||
(when restart (error "RESTART is not valid here"))
|
||||
(org-clock-clock-out clock fail-quietly (or clock-out-time resolve-to))
|
||||
(cond
|
||||
(org-clock-clocking-in nil)
|
||||
(close
|
||||
(setq org-clock-leftover-time (and (null clock-out-time) resolve-to))
|
||||
(move-marker org-clock-marker nil))
|
||||
(t
|
||||
(org-with-point-at heading
|
||||
(org-clock-in nil (and clock-out-time resolve-to)))))))))
|
||||
|
||||
(advice-add 'org-clock-out
|
||||
:override
|
||||
#'my/org-clock-out)
|
||||
|
||||
(advice-add 'org-clock-resolve-clock
|
||||
:override
|
||||
#'my/org-clock-resolve-clock)
|
||||
#+end_src
|
||||
* Modifications to the switch buffer functions
|
||||
#+begin_src emacs-lisp
|
||||
|
|
|
|||
Loading…
Reference in a new issue