tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Fix org-clock evaluation startup hang on Windows

Browse source 
* lisp/org-clock.el (org-x11idle-exists-p): Only shell out when running
on X.

The definition of this variable currently executes "command" via the
shell during evaluation, irrespective of the platform on which
Org-mode is running. Unfortunately, on Windows, this matches the
"command.com" NT Virtual DOS Machine executable and so this gets
launched, but this is a shell and therefore sits there waiting for
user input and never returns. The net result is that Emacs will hang
on Windows when evaluating org-clock.el with the ntdvm.exe process
spinning at 100%.

The simple fix is to check that the platform is X before trying to
deal with the "x11idle" external process.

TINYCHANGE
This commit is contained in:
Stuart Hickinbottom 2012-08-29 12:25:39 +01:00 committed by Bastien Guerry
parent 0455cc2084
commit 4f5bd2522e
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)))