From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 1 Dec 2022 12:40:47 +0000 (+0200)
Subject: Fix compilation of Org 9.6 on MS-Windows
X-Git-Tag: emacs-29.0.90~1400
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8b3baadf671b7b3d5058808c4655eca8bd46015e;p=emacs.git

Fix compilation of Org 9.6 on MS-Windows

* lisp/org/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.
---

diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 2758aeed407..f28805d5e6b 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/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'?