From 9263bf5766e23b1e0febca55f6acce1d9666773d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 23 Feb 2017 12:46:37 +0100 Subject: [PATCH] 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 --- lisp/org-duration.el | 1 + testing/lisp/test-org-duration.el | 1 + 2 files changed, 2 insertions(+) diff --git a/lisp/org-duration.el b/lisp/org-duration.el index f4e08d252..aca8a7efc 100644 --- a/lisp/org-duration.el +++ b/lisp/org-duration.el @@ -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 ":")))) diff --git a/testing/lisp/test-org-duration.el b/testing/lisp/test-org-duration.el index d9aca17b5..156ee5963 100644 --- a/testing/lisp/test-org-duration.el +++ b/testing/lisp/test-org-duration.el @@ -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)))