ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-02-03 22:53:30 +01:00
parent e01000a94c 83cea90599
commit 9a0b519b4e
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lisp/org-clock.el
View File

@ -1590,18 +1590,19 @@ to, overriding the existing value of `org-clock-out-switch-to-state'."
m (floor (/ s 60)) m (floor (/ s 60))
s (- s (* 60 s))) s (- s (* 60 s)))
(insert " => " (format "%2d:%02d" h m)) (insert " => " (format "%2d:%02d" h m))
(when (setq remove (and org-clock-out-remove-zero-time-clocks
(= (+ h m) 0)))
(beginning-of-line 1)
(delete-region (point) (point-at-eol))
(and (looking-at "\n") (> (point-max) (1+ (point)))
(delete-char 1)))
(move-marker org-clock-marker nil) (move-marker org-clock-marker nil)
(move-marker org-clock-hd-marker nil) (move-marker org-clock-hd-marker nil)
(when org-log-note-clock-out ;; Possibly remove zero time clocks. However, do not add
(org-add-log-setup ;; a note associated to the CLOCK line in this case.
'clock-out nil nil nil (cond ((and org-clock-out-remove-zero-time-clocks
(concat "# Task: " (org-get-heading t) "\n\n"))) (= (+ h m) 0))
(setq remove t)
(delete-region (line-beginning-position)
(line-beginning-position 2)))
(org-log-note-clock-out
(org-add-log-setup
'clock-out nil nil nil
(concat "# Task: " (org-get-heading t) "\n\n"))))
(when org-clock-mode-line-timer (when org-clock-mode-line-timer
(cancel-timer org-clock-mode-line-timer) (cancel-timer org-clock-mode-line-timer)
(setq org-clock-mode-line-timer nil)) (setq org-clock-mode-line-timer nil))

5
lisp/org.el
View File

@ -13815,7 +13815,10 @@ EXTRA is additional text that will be inserted into the notes buffer."
;; Find location for the new note. ;; Find location for the new note.
(goto-char org-log-note-marker) (goto-char org-log-note-marker)
(set-marker org-log-note-marker nil) (set-marker org-log-note-marker nil)
(goto-char (org-log-beginning t)) ;; Note associated to a clock is to be located right after
;; the clock. Do not move point.
(unless (eq org-log-note-purpose 'clock-out)
(goto-char (org-log-beginning t)))
;; Make sure point is at the beginning of an empty line. ;; Make sure point is at the beginning of an empty line.
(cond ((not (bolp)) (let ((inhibit-read-only t)) (insert "\n"))) (cond ((not (bolp)) (let ((inhibit-read-only t)) (insert "\n")))
((looking-at "[ \t]*\\S-") (save-excursion (insert "\n")))) ((looking-at "[ \t]*\\S-") (save-excursion (insert "\n"))))