[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[O] [PATCH] Fix org-clock evaluation startup hang on Windows
From: |
Stuart Hickinbottom |
Subject: |
[O] [PATCH] Fix org-clock evaluation startup hang on Windows |
Date: |
Wed, 29 Aug 2012 12:25:39 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120717 Thunderbird/14.0 |
* 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
---
lisp/org-clock.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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)))
--
1.7.11.4
--
Stuart Hickinbottom
- [O] [PATCH] Fix org-clock evaluation startup hang on Windows,
Stuart Hickinbottom <=