* Patch for org-clock.el
@ 2012-07-18 20:40 Nicolas Calderon
2012-07-24 15:10 ` Bastien
0 siblings, 1 reply; 2+ messages in thread
From: Nicolas Calderon @ 2012-07-18 20:40 UTC (permalink / raw)
To: emacs-orgmode
From c8979b360749ecd66e298fdbdbc2450668be3a20 Mon Sep 17 00:00:00 2001
From: Nicolas Calderon Asselin <nicolas.calderon.asselin@gmail.com>
Date: Wed, 18 Jul 2012 14:58:31 -0400
Subject: [PATCH 2/2] Added checks to determine which idle time to use
* lisp/org-clock.el (org-clock-idle-time): Org-mode assumed that x11idle
was an available command, and returned an idle time of 0 if it was not
(never idle). Added checks so that org-idle-time will come from emacs'
own current-idle-time if x11idle cannot be found or if it cannot
retrieve the idle time from X11
TINYCHANGE
---
lisp/org-clock.el | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 162ee07..a913014 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1010,7 +1010,12 @@ This routine returns a floating point number."
(cond
((eq system-type 'darwin)
(org-mac-idle-seconds))
- ((eq window-system 'x)
+ ((and
+ (eq window-system 'x)
+ ;; Check that x11idle exists
+ (eq (call-process-shell-command "command" nil nil nil "-v" "x11idle") 0)
+ ;; Check that x11idle can retrieve the idle time
+ (eq (call-process-shell-command "x11idle" nil nil nil ) 0))
(org-x11-idle-seconds))
(t
(org-emacs-idle-seconds))))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: Patch for org-clock.el
2012-07-18 20:40 Patch for org-clock.el Nicolas Calderon
@ 2012-07-24 15:10 ` Bastien
0 siblings, 0 replies; 2+ messages in thread
From: Bastien @ 2012-07-24 15:10 UTC (permalink / raw)
To: Nicolas Calderon; +Cc: emacs-orgmode
Hi Nicolas,
Nicolas Calderon <nicolas.calderon.asselin@gmail.com> writes:
> From c8979b360749ecd66e298fdbdbc2450668be3a20 Mon Sep 17 00:00:00 2001
> From: Nicolas Calderon Asselin <nicolas.calderon.asselin@gmail.com>
> Date: Wed, 18 Jul 2012 14:58:31 -0400
> Subject: [PATCH 2/2] Added checks to determine which idle time to use
>
> * lisp/org-clock.el (org-clock-idle-time): Org-mode assumed that x11idle
> was an available command, and returned an idle time of 0 if it was not
> (never idle). Added checks so that org-idle-time will come from emacs'
> own current-idle-time if x11idle cannot be found or if it cannot
> retrieve the idle time from X11
Applied, thanks a lot for catching this.
--
Bastien
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-24 15:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-18 20:40 Patch for org-clock.el Nicolas Calderon
2012-07-24 15:10 ` Bastien
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).