[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[O] [PATCH 4/9] org: move `org-duration-string-to-minutes' to a better p
From: |
Jan Malakhovski |
Subject: |
[O] [PATCH 4/9] org: move `org-duration-string-to-minutes' to a better place |
Date: |
Tue, 3 Nov 2015 20:15:42 +0000 |
---
lisp/org.el | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 6218a3a..a0fe644 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -18328,6 +18328,26 @@ If no number is found, the return value is 0."
(string-to-number (match-string 1 s)))
(t 0)))
+(defun org-duration-string-to-minutes (s &optional output-to-string)
+ "Convert a duration string S to minutes.
+
+A bare number is interpreted as minutes, modifiers can be set by
+customizing `org-effort-durations' (which see).
+
+Entries containing a colon are interpreted as H:MM by
+`org-hh:mm-string-to-minutes'."
+ (let ((result 0)
+ (re (concat "\\([0-9.]+\\) *\\("
+ (regexp-opt (mapcar 'car org-effort-durations))
+ "\\)")))
+ (while (string-match re s)
+ (incf result (* (cdr (assoc (match-string 2 s) org-effort-durations))
+ (string-to-number (match-string 1 s))))
+ (setq s (replace-match "" nil t s)))
+ (setq result (floor result))
+ (incf result (org-hh:mm-string-to-minutes s))
+ (if output-to-string (number-to-string result) result)))
+
(defcustom org-image-actual-width t
"Should we use the actual width of images when inlining them?
@@ -18386,26 +18406,6 @@ The value is a list, with zero or more of the symbols
`effort', `appt',
:package-version '(Org . "8.3")
:group 'org-agenda)
-(defun org-duration-string-to-minutes (s &optional output-to-string)
- "Convert a duration string S to minutes.
-
-A bare number is interpreted as minutes, modifiers can be set by
-customizing `org-effort-durations' (which see).
-
-Entries containing a colon are interpreted as H:MM by
-`org-hh:mm-string-to-minutes'."
- (let ((result 0)
- (re (concat "\\([0-9.]+\\) *\\("
- (regexp-opt (mapcar 'car org-effort-durations))
- "\\)")))
- (while (string-match re s)
- (incf result (* (cdr (assoc (match-string 2 s) org-effort-durations))
- (string-to-number (match-string 1 s))))
- (setq s (replace-match "" nil t s)))
- (setq result (floor result))
- (incf result (org-hh:mm-string-to-minutes s))
- (if output-to-string (number-to-string result) result)))
-
;;;; Files
(defun org-save-all-org-buffers ()
--
2.6.2
- [O] [PATCH v2 0/9] mail, clock and calc changes, Jan Malakhovski, 2015/11/03
- [O] [PATCH 1/9] org-clock: fix a typo, Jan Malakhovski, 2015/11/03
- [O] [PATCH 3/9] org-clock: fix `org-clock-time%', Jan Malakhovski, 2015/11/03
- [O] [PATCH 2/9] org-colview: add a FIXME, Jan Malakhovski, 2015/11/03
- [O] [PATCH 4/9] org: move `org-duration-string-to-minutes' to a better place,
Jan Malakhovski <=
- [O] [PATCH 5/9] rename `org-duration-string-to-minutes' to `org-clocksum-string-to-minutes' everywhere, Jan Malakhovski, 2015/11/03
- [O] [PATCH 6/9] factor out date-timestamp* calculations to org-store-link-props, Jan Malakhovski, 2015/11/03
[O] [PATCH 7/9] org-notmuch: add date support to org-notmuch-store-link, Jan Malakhovski, 2015/11/03
[O] [PATCH 8/9] ob-calc: add more API, documentation and examples so that it can be used in tables, Jan Malakhovski, 2015/11/03