From 1689a494635fce5fbbadbdc3bed50299fd7521ab Mon Sep 17 00:00:00 2001
From: Hendrik Tews
Date: Fri, 20 Nov 2020 23:12:09 +0100
Subject: fix coq-callcoq for emacs 27

Use process-file and omit find-file-name-handler, because
process-file takes care of file handlers already.

Fixes #525
---
 coq/coq-system.el | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/coq/coq-system.el b/coq/coq-system.el
index 637e0a27..2cc29e00 100644
--- a/coq/coq-system.el
+++ b/coq/coq-system.el
@@ -112,21 +112,14 @@ The given option should make coqtop return immediately.
 Optionally check the return code and return nil if the check
 fails.
 This function supports calling coqtop via tramp."
-  (let* ((default-directory
-           (if (file-accessible-directory-p default-directory)
-               default-directory
-             "/"))
-         (coq-command (shell-quote-argument (or coq-prog-name "coqtop")))) 
+  (let ((coq-command (or coq-prog-name "coqtop"))
+        retv)
     (with-temp-buffer
-      ;; Use `shell-command' via `find-file-name-handler' instead of
-      ;; `process-line': when the buffer is running TRAMP, PG uses
-      ;; `start-file-process', loading the binary from the remote server.
-      (let* ((shell-command-str (format "%s %s" coq-command (or option "")))
-             (fh (find-file-name-handler default-directory 'shell-command))
-             (retv (if fh (funcall fh 'shell-command shell-command-str (current-buffer))
-                     (shell-command shell-command-str (current-buffer)))))
-        (if (or (not expectedretv) (equal retv expectedretv))
-            (buffer-string))))))
+      (setq retv (if option
+                     (process-file coq-command nil t nil option)
+                   (process-file coq-command nil t nil)))
+      (if (or (not expectedretv) (equal retv expectedretv))
+          (buffer-string)))))
 
 (defun coq-autodetect-version (&optional interactive-p)
   "Detect and record the version of Coq currently in use.
-- 
cgit v1.2.3


From abfcd41041f5ba00d9d8f007808d67a312fbe8c4 Mon Sep 17 00:00:00 2001
From: Hendrik Tews
Date: Fri, 20 Nov 2020 23:38:22 +0100
Subject: protect coq-callcoq against escaping signals

This hopefully fixes compilation without coqtop and especially
the github tests.
---
 coq/coq-system.el | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/coq/coq-system.el b/coq/coq-system.el
index 2cc29e00..5b530e45 100644
--- a/coq/coq-system.el
+++ b/coq/coq-system.el
@@ -110,16 +110,20 @@ If it doesn't look right, try `coq-autodetect-version'."
   "Call coqtop with the given OPTION and return the output.
 The given option should make coqtop return immediately.
 Optionally check the return code and return nil if the check
-fails.
+fails.  Return also nil on other kinds of errors (e.g., `coq-prog-name'
+not found).
 This function supports calling coqtop via tramp."
   (let ((coq-command (or coq-prog-name "coqtop"))
         retv)
-    (with-temp-buffer
-      (setq retv (if option
-                     (process-file coq-command nil t nil option)
-                   (process-file coq-command nil t nil)))
-      (if (or (not expectedretv) (equal retv expectedretv))
-          (buffer-string)))))
+    (condition-case nil
+        (with-temp-buffer
+          (setq retv (if option
+                         (process-file coq-command nil t nil option)
+                       (process-file coq-command nil t nil)))
+          (if (or (not expectedretv) (equal retv expectedretv))
+              (buffer-string)))
+      (error nil))))
+        
 
 (defun coq-autodetect-version (&optional interactive-p)
   "Detect and record the version of Coq currently in use.
-- 
cgit v1.2.3