[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[O] [PATCH 5/9] rename `org-duration-string-to-minutes' to `org-clocksum
From: |
Jan Malakhovski |
Subject: |
[O] [PATCH 5/9] rename `org-duration-string-to-minutes' to `org-clocksum-string-to-minutes' everywhere |
Date: |
Tue, 3 Nov 2015 20:15:43 +0000 |
* lisp/org-agenda.el:
* lisp/org-clock.el:
* lisp/org-colview.el:
* lisp/org.el:
* contrib/lisp/org-depend.el:
* contrib/lisp/ox-taskjuggler.el: Rename (org-duration-string-to-minutes)
to (org-clocksum-string-to-minutes).
---
contrib/lisp/org-depend.el | 2 +-
contrib/lisp/ox-taskjuggler.el | 2 +-
lisp/org-agenda.el | 2 +-
lisp/org-clock.el | 14 +++++++-------
lisp/org-colview.el | 2 +-
lisp/org.el | 14 +++++++++-----
6 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/contrib/lisp/org-depend.el b/contrib/lisp/org-depend.el
index 1cd4130..7b263bc 100644
--- a/contrib/lisp/org-depend.el
+++ b/contrib/lisp/org-depend.el
@@ -270,7 +270,7 @@ This does two different kinds of triggers:
(effort (when (or effort-up effort-down)
(let ((effort (get-text-property (point)
'org-effort)))
(when effort
- (org-duration-string-to-minutes
effort))))))
+ (org-clocksum-string-to-minutes
effort))))))
(push (list (point) todo-kwd priority tags effort)
items))
(unless (org-goto-sibling)
diff --git a/contrib/lisp/ox-taskjuggler.el b/contrib/lisp/ox-taskjuggler.el
index 2bd47e6..b425b1b 100644
--- a/contrib/lisp/ox-taskjuggler.el
+++ b/contrib/lisp/ox-taskjuggler.el
@@ -861,7 +861,7 @@ a unique id will be associated to it."
(and complete (format " complete %s\n" complete))
(and effort
(format " effort %s\n"
- (let* ((minutes (org-duration-string-to-minutes effort))
+ (let* ((minutes (org-clocksum-string-to-minutes effort))
(hours (/ minutes 60.0)))
(format "%.1fh" hours))))
(and priority (format " priority %s\n" priority))
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 6313f52..ab4595b 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -7665,7 +7665,7 @@ E looks like \"+<2:25\"."
((equal op ??) op)
(t '=)))
(list 'org-agenda-compare-effort (list 'quote op)
- (org-duration-string-to-minutes e))))
+ (org-clocksum-string-to-minutes e))))
(defun org-agenda-compare-effort (op value)
"Compare the effort of the current line with VALUE, using OP.
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 4563a8a..ab65d3b 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -668,7 +668,7 @@ If not, show simply the clocked time like 01:50."
(let ((clocked-time (org-clock-get-clocked-time)))
(if org-clock-effort
(let* ((effort-in-minutes
- (org-duration-string-to-minutes org-clock-effort))
+ (org-clocksum-string-to-minutes org-clock-effort))
(work-done-str
(org-propertize
(org-minutes-to-clocksum-string clocked-time)
@@ -749,10 +749,10 @@ clocked item, and the value displayed in the mode line."
;; A string. See if it is a delta
(setq sign (string-to-char value))
(if (member sign '(?- ?+))
- (setq current (org-duration-string-to-minutes current)
+ (setq current (org-clocksum-string-to-minutes current)
value (substring value 1))
(setq current 0))
- (setq value (org-duration-string-to-minutes value))
+ (setq value (org-clocksum-string-to-minutes value))
(if (equal ?- sign)
(setq value (- current value))
(if (equal ?+ sign) (setq value (+ current value)))))
@@ -770,7 +770,7 @@ clocked item, and the value displayed in the mode line."
"Show notification if we spent more time than we estimated before.
Notification is shown only once."
(when (org-clocking-p)
- (let ((effort-in-minutes (org-duration-string-to-minutes org-clock-effort))
+ (let ((effort-in-minutes (org-clocksum-string-to-minutes org-clock-effort))
(clocked-time (org-clock-get-clocked-time)))
(if (setq org-clock-task-overrun
(if (or (null effort-in-minutes) (zerop effort-in-minutes))
@@ -1193,7 +1193,7 @@ make this the default behavior.)"
(setq org-clock-notification-was-shown nil)
(org-refresh-properties
org-effort-property '((effort . identity)
- (effort-minutes . org-duration-string-to-minutes)))
+ (effort-minutes . org-clocksum-string-to-minutes)))
(catch 'abort
(let ((interrupting (and (not org-clock-resolving-clocks-due-to-idleness)
(org-clocking-p)))
@@ -2869,13 +2869,13 @@ TIME: The sum of all time spend in this tree, in
minutes. This time
"Compute a time fraction in percent.
TOTAL s a total time string.
STRINGS is a list of strings that should be checked for a time.
-Strings are parsed using `org-duration-string-to-minutes`.
+Strings are parsed using `org-clocksum-string-to-minutes`.
The first string that does have a time will be used. This
function is made for clock tables."
(save-match-data
(let (tot s cur)
(catch 'exit
- (setq tot (org-duration-string-to-minutes total))
+ (setq tot (org-clocksum-string-to-minutes total))
(if (= tot 0.) (throw 'exit 0.))
(while (setq s (pop strings))
(setq cur (org-clocksum-string-to-minutes s))
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index d27abc3..bbbeea9 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -1119,7 +1119,7 @@ display, or in the #+COLUMNS line of the current buffer."
((string-match (concat "\\([0-9.]+\\) *\\("
(regexp-opt (mapcar 'car org-effort-durations))
"\\)") s)
- (setq s (concat "0:" (org-duration-string-to-minutes s t)))
+ (setq s (concat "0:" (org-clocksum-string-to-minutes s t)))
(let ((l (nreverse (org-split-string s ":"))) (sum 0.0))
(while l
(setq sum (+ (string-to-number (pop l)) (/ sum 60))))
diff --git a/lisp/org.el b/lisp/org.el
index a0fe644..c466870 100755
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3699,7 +3699,7 @@ and the clock summary:
((\"Remaining\" (lambda(value)
(let ((clocksum (org-clock-sum-current-item))
- (effort (org-duration-string-to-minutes
+ (effort (org-clocksum-string-to-minutes
(org-entry-get (point) \"Effort\"))))
(org-minutes-to-clocksum-string (- effort clocksum))))))"
:group 'org-properties
@@ -9612,7 +9612,7 @@ The refresh happens only for the current tree (not
subtree)."
(org-refresh-properties
org-effort-property
'((effort . identity)
- (effort-minutes . org-duration-string-to-minutes))))
+ (effort-minutes . org-clocksum-string-to-minutes))))
;;;; Link Stuff
@@ -15673,7 +15673,7 @@ When INCREMENT is non-nil, set the property to the next
allowed value."
(org-entry-put nil prop val))
(org-refresh-property
'((effort . identity)
- (effort-minutes . org-duration-string-to-minutes))
+ (effort-minutes . org-clocksum-string-to-minutes))
val)
(when (string= heading org-clock-current-task)
(setq org-clock-effort (get-text-property (point-at-bol) 'effort))
@@ -16534,7 +16534,7 @@ completion."
(when (equal prop org-effort-property)
(org-refresh-property
'((effort . identity)
- (effort-minutes . org-duration-string-to-minutes))
+ (effort-minutes . org-clocksum-string-to-minutes))
nval)
(when (string= org-clock-current-task heading)
(setq org-clock-effort nval)
@@ -18328,7 +18328,7 @@ 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)
+(defun org-clocksum-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
@@ -18348,6 +18348,10 @@ Entries containing a colon are interpreted as H:MM by
(incf result (org-hh:mm-string-to-minutes s))
(if output-to-string (number-to-string result) result)))
+(defalias 'org-duration-string-to-minutes 'org-clocksum-string-to-minutes)
+(make-obsolete 'org-duration-string-to-minutes 'org-clocksum-string-to-minutes
+ "Org mode version 8.3")
+
(defcustom org-image-actual-width t
"Should we use the actual width of images when inlining them?
--
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, 2015/11/03
- [O] [PATCH 5/9] rename `org-duration-string-to-minutes' to `org-clocksum-string-to-minutes' everywhere,
Jan Malakhovski <=
- [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
[O] [PATCH 9/9] ob-calc: don't leave garbage on the stack, Jan Malakhovski, 2015/11/03