From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 16 Apr 2015 02:04:40 +0000 (-0400)
Subject: * lisp/org/org-clock.el (org-x11idle-exists-p): Be honest about which
X-Git-Tag: emacs-25.0.90~2402
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=caea9a238590f2d165c74a5941c50946677b87ae;p=emacs.git

* lisp/org/org-clock.el (org-x11idle-exists-p): Be honest about which

command is actually sent to the shell.
---

diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index d21d270b835..41e799f9898 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -1066,9 +1066,11 @@ If `only-dangling-p' is non-nil, only ask to resolve dangling
 (defvar org-x11idle-exists-p
   ;; Check that x11idle exists
   (and (eq window-system 'x)
-       (eq (call-process-shell-command "command" nil nil nil "-v" org-clock-x11idle-program-name) 0)
+       (eq 0 (call-process-shell-command
+              (format "command -v %s" org-clock-x11idle-program-name)))
        ;; Check that x11idle can retrieve the idle time
-       (eq (call-process-shell-command org-clock-x11idle-program-name nil nil nil) 0)))
+       ;; FIXME: Why "..-shell-command" rather than just `call-process'?
+       (eq 0 (call-process-shell-command org-clock-x11idle-program-name))))
 
 (defun org-x11-idle-seconds ()
   "Return the current X11 idle time in seconds."