summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Wahl <marcowahlsoft@gmail.com>2016-06-14 21:49:44 +0200
committerMarco Wahl <marcowahlsoft@gmail.com>2016-06-14 21:49:44 +0200
commit2c4e13c56aa0d7f3c8a3c55bf72bedab7b5572a6 (patch)
tree8c5c056a15eab541ac0edc4f62afdd8aaae1286e
parent613b27795bbebd7653133ce2c9ff5aa1b0cf9b72 (diff)
downloadorg-mode-2c4e13c56aa0d7f3c8a3c55bf72bedab7b5572a6.tar.gz
org-timer: User can always set timer by prefix arg
* lisp/org-timer.el (org-timer-set-timer): The user can always set the timer with a numeric prefix argument. Before, when the effort property has been set, the user lost control to explicitly set the timer to a different time.
-rw-r--r--lisp/org-timer.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 0e508cf..41de0f2 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -433,10 +433,10 @@ using three `C-u' prefix arguments."
(number-to-string org-timer-default-timer)
org-timer-default-timer))
(effort-minutes (ignore-errors (org-get-at-eol 'effort-minutes 1)))
- (minutes (or (and (not (equal opt '(64)))
+ (minutes (or (and (numberp opt) (number-to-string opt))
+ (and (not (equal opt '(64)))
effort-minutes
(number-to-string effort-minutes))
- (and (numberp opt) (number-to-string opt))
(and (consp opt) default-timer)
(and (stringp opt) opt)
(read-from-minibuffer