mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'bugfix'

This commit is contained in:
Ihor Radchenko 2023-01-13 12:08:49 +03:00
parent 76f9a3c2cb 97a235cf1c
commit d71bb04f78
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lisp/org-clock.el
View File

@ -1801,17 +1801,25 @@ Optional argument N tells to change by that many units."
(time-subtract (time-subtract
(org-time-string-to-time org-last-changed-timestamp) (org-time-string-to-time org-last-changed-timestamp)
(org-time-string-to-time ts))) (org-time-string-to-time ts)))
(save-excursion ;; `save-excursion' won't work because
(goto-char begts) ;; `org-timestamp-change' deletes and re-inserts the
(org-timestamp-change ;; timestamp.
(round (/ (float-time tdiff) (let ((origin (point)))
(pcase timestamp? (save-excursion
(`minute 60) (goto-char begts)
(`hour 3600) (org-timestamp-change
(`day (* 24 3600)) (round (/ (float-time tdiff)
(`month (* 24 3600 31)) (pcase timestamp?
(`year (* 24 3600 365.2))))) (`minute 60)
timestamp? 'updown))))))) (`hour 3600)
(`day (* 24 3600))
(`month (* 24 3600 31))
(`year (* 24 3600 365.2)))))
timestamp? 'updown))
;; Move back to initial position, but never beyond updated
;; clock.
(unless (< (point) origin)
(goto-char origin))))))))
;;;###autoload ;;;###autoload
(defun org-clock-cancel () (defun org-clock-cancel ()