diff options
| author | Eli Zaretskii | 2017-09-29 13:24:05 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2017-09-29 13:24:05 +0300 |
| commit | 33401b26b1aecf61adfd77fa7c4e29913c0bb3d7 (patch) | |
| tree | 0238b3a9e51c4a37f8fe35feb11a66baeb2d1f3d /lisp/org/org-timer.el | |
| parent | c1ac8c170f17a98b7e5d6e098f707daeb71ea27d (diff) | |
| parent | d4b2bbdc73ace5cb0971a32a75941486489d1cc5 (diff) | |
| download | emacs-33401b26b1aecf61adfd77fa7c4e29913c0bb3d7.tar.gz emacs-33401b26b1aecf61adfd77fa7c4e29913c0bb3d7.zip | |
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
Diffstat (limited to 'lisp/org/org-timer.el')
| -rw-r--r-- | lisp/org/org-timer.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el index 88dc1a85009..5acf526f183 100644 --- a/lisp/org/org-timer.el +++ b/lisp/org/org-timer.el | |||
| @@ -436,7 +436,7 @@ using three `C-u' prefix arguments." | |||
| 436 | (if (numberp org-timer-default-timer) | 436 | (if (numberp org-timer-default-timer) |
| 437 | (number-to-string org-timer-default-timer) | 437 | (number-to-string org-timer-default-timer) |
| 438 | org-timer-default-timer)) | 438 | org-timer-default-timer)) |
| 439 | (effort-minutes (ignore-errors (org-get-at-eol 'effort-minutes 1))) | 439 | (effort-minutes (ignore-errors (floor (org-get-at-eol 'effort-minutes 1)))) |
| 440 | (minutes (or (and (numberp opt) (number-to-string opt)) | 440 | (minutes (or (and (numberp opt) (number-to-string opt)) |
| 441 | (and (not (equal opt '(64))) | 441 | (and (not (equal opt '(64))) |
| 442 | effort-minutes | 442 | effort-minutes |