diff options
author | Bastien <bzg@gnu.org> | 2015-08-04 22:03:02 +0200 |
---|---|---|
committer | Bastien <bzg@gnu.org> | 2015-08-04 22:03:02 +0200 |
commit | c6a37497586f6175afe869dbb9d4c1d2544235ac (patch) | |
tree | b837ac5811228fa46d85992dbc7bff2e1dd23099 | |
parent | 9111c21a75f63eb9e1075b7c1d7db8f59da3b865 (diff) | |
download | org-mode-c6a37497586f6175afe869dbb9d4c1d2544235ac.tar.gz |
org-timer.el (org-timer-set-timer): Don't choke at wrong type
* org-timer.el (org-timer-set-timer): Don't choke at wrong
type for `org-timer-default-timer'.
-rw-r--r-- | lisp/org-timer.el | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/org-timer.el b/lisp/org-timer.el index ffaeffc..d05ad86 100644 --- a/lisp/org-timer.el +++ b/lisp/org-timer.el @@ -405,7 +405,7 @@ VALUE can be `on', `off', or `pause'." (defun org-timer-set-timer (&optional opt) "Prompt for a duration in minutes or hh:mm:ss and set a timer. -If `org-timer-default-timer' is not zero, suggest this value as +If `org-timer-default-timer' is not \"0\", suggest this value as the default duration for the timer. If a timer is already set, prompt the user if she wants to replace it. @@ -426,17 +426,21 @@ using three `C-u' prefix arguments." (when (and org-timer-start-time (not org-timer-countdown-timer)) (user-error "Relative timer is running. Stop first")) - (let* ((effort-minutes (ignore-errors (org-get-at-eol 'effort-minutes 1))) + (let* ((default-timer + ;; `org-timer-default-timer' used to be a number, don't choke: + (if (numberp org-timer-default-timer) + (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))) effort-minutes (number-to-string effort-minutes)) (and (numberp opt) (number-to-string opt)) - (and (consp opt) org-timer-default-timer) + (and (consp opt) default-timer) (and (stringp opt) opt) (read-from-minibuffer "How much time left? (minutes or h:mm:ss) " - (and (not (string-equal org-timer-default-timer "0")) - org-timer-default-timer))))) + (and (not (string-equal default-timer "0")) default-timer))))) (when (string-match "\\`[0-9]+\\'" minutes) (setq minutes (concat minutes ":00"))) (if (not (string-match "[0-9]+" minutes)) |