From e2329cc961ece5791db1bd9057a94fa8b2248717 Mon Sep 17 00:00:00 2001 From: Muchenxuan Tong Date: Wed, 29 Aug 2012 19:54:44 +0200 Subject: [PATCH] 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 --- lisp/org-timer.el | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lisp/org-timer.el b/lisp/org-timer.el index 551dbea67..92aaf1c7b 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 -- 2.11.4.GIT