summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2010-09-03 15:26:47 +0200
committerBastien Guerry <bzg@altern.org>2010-09-03 15:26:47 +0200
commit8f173ce8434a540adbddd9cd81cf380a18894767 (patch)
tree0aeabba32ae61ba70e35039c440680edd63b6c3d
parent00fadebf9c274424794de6b1bb0846d61ce2dc3e (diff)
downloadorg-mode-8f173ce8434a540adbddd9cd81cf380a18894767.tar.gz
Make `org-timer-cancel-timer' turn off the modeline countdown.
Also bind `org-timer-cancel-timer' to `C-c C-x :' in org-mode. We may want to bind this command in org-agenda-mode as well but I don't have any good idea of a keybinding now.
-rw-r--r--lisp/org-timer.el4
-rw-r--r--lisp/org.el1
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 7519d85..80b8cd9 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -303,7 +303,9 @@ VALUE can be `on', `off', or `pause'."
(when (eval org-timer-current-timer)
(run-hooks 'org-timer-cancel-hook)
(cancel-timer org-timer-current-timer)
- (setq org-timer-current-timer nil))
+ (setq org-timer-current-timer nil)
+ (setq org-timer-timer-is-countdown nil)
+ (org-timer-set-mode-line 'off))
(message "Last timer canceled"))
(defun org-timer-show-remaining-time ()
diff --git a/lisp/org.el b/lisp/org.el
index 7a5cbf8..26acc69 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -16380,6 +16380,7 @@ BEG and END default to the buffer boundaries."
(org-defkey org-mode-map "\C-c\C-xo" 'org-toggle-ordered-property)
(org-defkey org-mode-map "\C-c\C-xi" 'org-insert-columns-dblock)
(org-defkey org-mode-map [(control ?c) (control ?x) ?\;] 'org-timer-set-timer)
+(org-defkey org-mode-map [(control ?c) (control ?x) ?\:] 'org-timer-cancel-timer)
(org-defkey org-mode-map "\C-c\C-x." 'org-timer)
(org-defkey org-mode-map "\C-c\C-x-" 'org-timer-item)