emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Muchenxuan Tong <demon386@gmail.com>
To: emacs-orgmode@gnu.org
Subject: [PATCH] Check org-timer-display in org-timer-set-mode-line when, value is 'off
Date: Tue, 28 Aug 2012 20:03:33 +0800	[thread overview]
Message-ID: <503CB395.3020908@gmail.com> (raw)

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 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
--
1.7.12

next             reply	other threads:[~2012-08-28 12:03 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-28 12:03 Muchenxuan Tong [this message]
2012-08-29 17:56 ` [PATCH] Check org-timer-display in org-timer-set-mode-line when, value is 'off Bastien

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:551dbea dfblob:92aaf1c )
 OR (
bs:"[PATCH] Check org-timer-display in org-timer-set-mode-line when, value is 'off" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=503CB395.3020908@gmail.com \
    --to=demon386@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).