ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-08-29 19:41:23 +02:00
parent 51befd3db0 4f5bd2522e
commit b05621d2b9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org-clock.el
View File

@ -1001,7 +1001,8 @@ If `only-dangling-p' is non-nil, only ask to resolve dangling
(defvar org-x11idle-exists-p
;; Check that x11idle exists
(and (eq (call-process-shell-command "command" nil nil nil "-v" "x11idle") 0)
(and (eq window-system 'x)
(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)))