From: Eshel Yaron <me@eshelyaron.com>
Date: Thu, 17 Aug 2023 21:33:46 +0000 (+0200)
Subject: Use 'process-lines-handling-status'.
X-Git-Tag: V9.1.14-sweep-0.23.0~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ed2733e7216466ff4f9d86029786c3480c8ed986;p=sweep.git

Use 'process-lines-handling-status'.

* sweeprolog.el (sweeprolog--ensure-module): Use
'process-lines-handling-status' instead of 'split-string'-based
approach.
---

diff --git a/sweeprolog.el b/sweeprolog.el
index 693befc..7a11bfc 100644
--- a/sweeprolog.el
+++ b/sweeprolog.el
@@ -745,21 +745,19 @@ pack completion candidates."
                      sweeprolog--directory)))
       (unless (file-readable-p sweep-pl)
         (error "Missing file `sweep.pl' in `sweeprolog' directory"))
-      (if-let ((lines (save-match-data
-                        (split-string
-                         (with-output-to-string
-                           (with-current-buffer standard-output
-                             (call-process
-                              (or sweeprolog-swipl-path "swipl")
-                              nil '(t nil) nil
-                              "-q" "-g" "write_sweep_module_location"
-                              "-t" "halt"
-                              sweep-pl)))
-                         "\n" t))))
-          (mapc #'sweeprolog--load-module lines)
-        (error (concat "Failed to locate `sweep-module'. "
-                       "Make sure SWI-Prolog is installed "
-                       "and up to date"))))))
+      (let* ((success nil)
+             (lines (process-lines-handling-status
+                     (or sweeprolog-swipl-path "swipl")
+                     (lambda (status)
+                       (setq success (= status 0)))
+                     "-q" "-g" "write_sweep_module_location"
+                     "-t" "halt"
+                     sweep-pl)))
+        (if (and success lines)
+            (mapc #'sweeprolog--load-module lines)
+          (error (concat "Failed to locate `sweep-module'. "
+                         "Make sure SWI-Prolog is installed "
+                         "and up to date")))))))
 
 (defun sweeprolog-ensure-initialized ()
   (sweeprolog--ensure-module)