From db2bf2a8189ed00c6b5e8cbc31006b3844a7c78c Mon Sep 17 00:00:00 2001 From: Nicolas Calderon Asselin Date: Wed, 18 Jul 2012 14:58:31 -0400 Subject: [PATCH] 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 162ee07b6..9745fda8f 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))))