summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2018-06-25 17:11:12 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2018-06-25 17:13:04 +0200
commitaccf99cbc0974b39039c4b010e7237a24dae927f (patch)
tree509109522bd25fc52896a32ff150a3b67db0a31a
parent2fcf55f2735a0f7273e0e95e50b08ad4baf7bdb2 (diff)
downloadorg-mode-accf99cbc0974b39039c4b010e7237a24dae927f.tar.gz
Deprecate `org-effort-durations'
* lisp/org.el (org-effort-duration): Remove unused variable. * lisp/org-compat.el (org-effort-durations): Make `org-effort-duration' an alias for `org-duration-units'. * lisp/org-clock.el (org-clock-modify-effort-estimate): Fix docstring. * doc/org-manual.org (Footnotes): Clarify footnote. The variable is inactive since introduction of "org-duration" library.
-rw-r--r--doc/org-manual.org6
-rw-r--r--lisp/org-clock.el4
-rw-r--r--lisp/org-compat.el3
-rw-r--r--lisp/org.el23
4 files changed, 8 insertions, 28 deletions
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 992629a..ee25fc7 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -21016,9 +21016,9 @@ configured keys.
[fn:56] If more than one summary type applies to the same property,
the parent values are computed according to the first of them.
-[fn:57] An age is defined as a duration, using effort modifiers
-defined in ~org-effort-durations~, e.g., =3d 1h=. If any value in the
-column is as such, the summary is also an effort duration.
+[fn:57] An age can be defined as a duration, using units defined in
+~org-duration-units~, e.g., =3d 1h=. If any value in the column is as
+such, the summary is also expressed as a duration.
[fn:58] Please note that the =COLUMNS= definition must be on a single
line; it is wrapped here only because of formatting constraints.
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index a013bc5..b769a4f 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -733,8 +733,8 @@ previous clocking intervals."
VALUE can be a number of minutes, or a string with format hh:mm or mm.
When the string starts with a + or a - sign, the current value of the effort
property will be changed by that amount. If the effort value is expressed
-as an `org-effort-durations' (e.g. \"3h\"), the modified value will be
-converted to a hh:mm duration.
+as an unit defined in `org-duration-units' (e.g. \"3h\"), the modified
+value will be converted to a hh:mm duration.
This command will update the \"Effort\" property of the currently
clocked item, and the value displayed in the mode line."
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index f218f3b..714ad78 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -228,6 +228,9 @@ Counting starts at 1."
(define-obsolete-function-alias 'org-remove-from-invisibility-spec
'remove-from-invisibility-spec "Org 9.2")
+(define-obsolete-variable-alias 'org-effort-durations 'org-duration-units
+ "Org 9.2")
+
(defun org-in-fixed-width-region-p ()
"Non-nil if point in a fixed-width region."
(save-match-data
diff --git a/lisp/org.el b/lisp/org.el
index 664c0ac..4995942 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -17563,29 +17563,6 @@ If there is already a time stamp at the cursor position, update it."
(org-insert-time-stamp
(encode-time 0 0 0 (nth 1 cal-date) (car cal-date) (nth 2 cal-date))))))
-(defcustom org-effort-durations
- `(("min" . 1)
- ("h" . 60)
- ("d" . ,(* 60 8))
- ("w" . ,(* 60 8 5))
- ("m" . ,(* 60 8 5 4))
- ("y" . ,(* 60 8 5 40)))
- "Conversion factor to minutes for an effort modifier.
-
-Each entry has the form (MODIFIER . MINUTES).
-
-In an effort string, a number followed by MODIFIER is multiplied
-by the specified number of MINUTES to obtain an effort in
-minutes.
-
-For example, if the value of this variable is ((\"hours\" . 60)), then an
-effort string \"2hours\" is equivalent to 120 minutes."
- :group 'org-agenda
- :version "26.1"
- :package-version '(Org . "8.3")
- :type '(alist :key-type (string :tag "Modifier")
- :value-type (number :tag "Minutes")))
-
(defcustom org-image-actual-width t
"Should we use the actual width of images when inlining them?