Browse Source

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
Muchenxuan Tong 12 years ago
parent
commit
e2329cc961
1 changed files with 8 additions and 4 deletions
  1. 8 4
      lisp/org-timer.el

+ 8 - 4
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