diff options
| author | Carsten Dominik <carsten.dominik@gmail.com> | 2009-11-05 16:11:57 +0100 |
|---|---|---|
| committer | Carsten Dominik <carsten.dominik@gmail.com> | 2009-11-05 16:11:57 +0100 |
| commit | 1962a53c80780c06732d9e16fc1b257ce77490d5 (patch) | |
| tree | 558d0a9abfff58a64b2be88a0373411e00b9c4b9 | |
| parent | f90f96bc29a49c19137087c61d6d3a68e683daf9 (diff) | |
| download | org-mode-1962a53c80780c06732d9e16fc1b257ce77490d5.tar.gz | |
Set variables org-timer-timer[123] correctly.
Patch by Stephan Schmitt
| -rwxr-xr-x | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/org-timer.el | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 140806e..0dca35d 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2009-11-05 Carsten Dominik <carsten.dominik@gmail.com> + * org-timer.el (org-timer-set-timer): Set variables + org-timer-timer[123] correctly. + + * org-mobile.el (org-mobile-files-alist): Make it work when `agenda-archives' is included in `org-agenda-text-search-extra-files'. diff --git a/lisp/org-timer.el b/lisp/org-timer.el index 8a59c74..660312a 100644 --- a/lisp/org-timer.el +++ b/lisp/org-timer.el @@ -312,12 +312,12 @@ VALUE can be `on', `off', or `pause'." (t (error "Not in an Org buffer")))) timer-set) (mapcar (lambda(timer) - (if (not (or (eval timer) timer-set)) - (setq timer-set t - timer - (run-with-timer - secs nil 'org-notify (format "%s: time out" hl) t) - org-timer-last-timer timer))) + (when (not (or (eval timer) timer-set)) + (setq timer-set t) + (setq org-timer-last-timer + (run-with-timer + secs nil 'org-notify (format "%s: time out" hl) t)) + (set timer org-timer-last-timer))) '(org-timer-timer1 org-timer-timer2 org-timer-timer3))))) |