0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 18:36:26 +00:00

org-duration: `org-duration-to-minutes' accepts plain numbers

* lisp/org-duration.el (org-duration-to-minutes): Accept plain numbers
  for backward compatibility with `org-hh:mm-string-to-minutes'.

* testing/lisp/test-org-duration.el (test-org-duration/to-minutes):
  Add test.

Reported-by: Dale <dale@codefu.org>
<http://permalink.gmane.org/gmane.emacs.orgmode/112290>
This commit is contained in:
Nicolas Goaziou 2017-02-23 12:46:37 +01:00
parent b1353cb6f8
commit 9263bf5766
2 changed files with 2 additions and 0 deletions

View file

@ -279,6 +279,7 @@ As a special case, a bare number represents minutes.
Return value as a float. Raise an error if duration format is
not recognized."
(cond
((numberp duration) (float duration))
((string-match-p org-duration--h:mm-re duration)
(pcase-let ((`(,hours ,minutes ,seconds)
(mapcar #'string-to-number (split-string duration ":"))))

View file

@ -34,6 +34,7 @@
;; Special case: a bare number is treated as minutes.
(should (= (org-duration-to-minutes "2") 2))
(should (= (org-duration-to-minutes "2.5") 2.5))
(should (= (org-duration-to-minutes 1) 1))
;; Support custom units.
(should (= 4
(let ((org-duration-units '(("longmin" . 2)))