[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals-release/org 3159ea296f 3/4: Backport commit 8b3baadf6 f
From: |
ELPA Syncer |
Subject: |
[elpa] externals-release/org 3159ea296f 3/4: Backport commit 8b3baadf6 from Emacs |
Date: |
Thu, 1 Dec 2022 17:58:05 -0500 (EST) |
branch: externals-release/org
commit 3159ea296f6fd37bb3e4d51b1343bb3b1c9fd887
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Kyle Meyer <kyle@kyleam.com>
Backport commit 8b3baadf6 from Emacs
* lisp/org-clock.el (org-x11idle-exists-p): Don't try to
invoke "command x11idle" on MS-Windows and MS-DOS. This fixes a
hang during byte-compilation of Org.
Fix compilation of Org 9.6 on MS-Windows
8b3baadf671b7b3d5058808c4655eca8bd46015e
Eli Zaretskii
Thu Dec 1 14:40:47 2022 +0200
---
lisp/org-clock.el | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 2758aeed40..f28805d5e6 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1198,8 +1198,11 @@ If `only-dangling-p' is non-nil, only ask to resolve
dangling
(string-to-number (shell-command-to-string "ioreg -c IOHIDSystem | perl -ane
'if (/Idle/) {$idle=(pop @F)/1000000000; print $idle; last}'")))
(defvar org-x11idle-exists-p
- ;; Check that x11idle exists
- (and (eq 0 (call-process-shell-command
+ ;; Check that x11idle exists. But don't do that on DOS/Windows,
+ ;; since the command definitely does NOT exist there, and invoking
+ ;; COMMAND.COM on MS-Windows is a bad idea -- it hangs.
+ (and (null (memq system-type '(windows-nt ms-dos)))
+ (eq 0 (call-process-shell-command
(format "command -v %s" org-clock-x11idle-program-name)))
;; Check that x11idle can retrieve the idle time
;; FIXME: Why "..-shell-command" rather than just `call-process'?