mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-26 07:33:39 +00:00
Code

Revert "org-clock.el (org-user-idle-seconds): Simplify."

Browse Source 
This reverts commit f398b9ee53.
This commit is contained in:
Bastien Guerry 2012-07-28 08:35:04 +02:00
parent 6347bf2f72
commit 0102b4b404
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lisp/org-clock.el
View File

@ -1009,9 +1009,15 @@ This routine returns a floating point number."
(cond
((eq system-type 'darwin)
(org-mac-idle-seconds))
((eq window-system 'x)
(max (org-x11-idle-seconds) (org-emacs-idle-seconds)))
(t (org-emacs-idle-seconds))))
((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))))
(defvar org-clock-user-idle-seconds)