diff options
| author | Stuart Hickinbottom <stuart@hickinbottom.com> | 2012-08-29 12:25:39 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2012-08-29 19:41:14 +0200 |
| commit | 4f5bd2522eefb668c75dbc59c141917b07dd849c (patch) | |
| tree | c4819db7f7f45273b54b1dac07a0175552f26254 | |
| parent | 0455cc2084d47e2e016e1b7d1d676d4fb2a5a0b5 (diff) | |
| download | org-mode-4f5bd2522eefb668c75dbc59c141917b07dd849c.tar.gz | |
Fix org-clock evaluation startup hang on Windows
* 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
| -rw-r--r-- | lisp/org-clock.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 263f2cb..91f1c63 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -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))) |