diff options
author | Muchenxuan Tong <demon386@gmail.com> | 2012-08-29 19:54:44 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2012-08-29 19:54:44 +0200 |
commit | e2329cc961ece5791db1bd9057a94fa8b2248717 (patch) | |
tree | 6e2972b257a96063f7b045512a9391afe86798a6 | |
parent | 4f5bd2522eefb668c75dbc59c141917b07dd849c (diff) | |
download | org-mode-e2329cc961ece5791db1bd9057a94fa8b2248717.tar.gz |
org-timer.el: Check `org-timer-display' in `org-timer-set-mode-line' when value is 'off
* lisp/org-timer.el (org-timer-set-mode-line): Check
`org-timer-display' when value is 'off.
This solves the error of (org-timer-set-mode-line 'off) when
`org-timer-display' is 'mode-line. In this case `frame-title-format'
may not be a list.
TINYCHANGE
-rw-r--r-- | lisp/org-timer.el | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/org-timer.el b/lisp/org-timer.el index 551dbea..92aaf1c 100644 --- a/lisp/org-timer.el +++ b/lisp/org-timer.el @@ -304,10 +304,14 @@ VALUE can be `on', `off', or `pause'." (when org-timer-mode-line-timer (cancel-timer org-timer-mode-line-timer) (setq org-timer-mode-line-timer nil)) - (setq global-mode-string - (delq 'org-timer-mode-line-string global-mode-string)) - (setq frame-title-format - (delq 'org-timer-mode-line-string frame-title-format)) + (when (or (eq org-timer-display 'mode-line) + (eq org-timer-display 'both)) + (setq global-mode-string + (delq 'org-timer-mode-line-string global-mode-string))) + (when (or (eq org-timer-display 'frame-title) + (eq org-timer-display 'both)) + (setq frame-title-format + (delq 'org-timer-mode-line-string frame-title-format))) (force-mode-line-update)) ((equal value 'pause) (when org-timer-mode-line-timer |