From 875ae5a773bb86f893a557750a6d99118b46eedf Mon Sep 17 00:00:00 2001
From: drzv <206765402+drzv@users.noreply.github.com>
Date: Tue, 26 May 2026 01:55:01 +0000
Subject: [PATCH 1/2] showterm.el: revert #3338

---
 tools/showterm.el | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/tools/showterm.el b/tools/showterm.el
index d5741298..37cde277 100644
--- a/tools/showterm.el
+++ b/tools/showterm.el
@@ -76,18 +76,16 @@
         (setq str (buffer-string))
         (erase-buffer))
       (let ((proc (let (process-connection-type)
-                    (make-process :name "convert"
-                                  :buffer (current-buffer)
-                                  :stderr " convert-stderr"
-                                  :command `("convert"
-                                             "png:-"
-                                             "-gravity" "center"
-                                             "-background" "white"
-                                             "-scale" ,(format "%dx%d"
-                                                               showterm-pixel-width
-                                                               showterm-pixel-width)
-                                             "-extent" ,(format "%dx" showterm-pixel-width)
-                                             "png:-")))))
+                    (start-process "convert" (current-buffer)
+                                   "convert"
+                                   "png:-"
+                                   "-gravity" "center"
+                                   "-background" "white"
+                                   "-scale" (format "%dx%d"
+                                                    showterm-pixel-width
+                                                    showterm-pixel-width)
+                                   "-extent" (format "%dx" showterm-pixel-width)
+                                   "png:-"))))
         (process-send-string proc str)
         (process-send-eof proc)
         (showterm-wait-for-process proc))

From 36cbeb3d6ce057c57bae850189877f5dcd7eec5f Mon Sep 17 00:00:00 2001
From: drzv <206765402+drzv@users.noreply.github.com>
Date: Tue, 26 May 2026 08:14:54 -0400
Subject: [PATCH 2/2] showterm.el: use new magick command by default, fallback
 to convert

---
 tools/showterm.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tools/showterm.el b/tools/showterm.el
index 37cde277..684cc172 100644
--- a/tools/showterm.el
+++ b/tools/showterm.el
@@ -6,7 +6,7 @@
 ;;
 ;;     - Scryer Prolog
 ;;     - `dot' (from Graphviz)
-;;     - `convert' (from ImageMagick)
+;;     - `convert' or `magick' (from ImageMagick)
 ;;
 ;; Copy showterm.el and showterm.pl to the same directory,
 ;; say ~/scryer-prolog/tools/, and add to your .emacs:
@@ -76,8 +76,9 @@
         (setq str (buffer-string))
         (erase-buffer))
       (let ((proc (let (process-connection-type)
-                    (start-process "convert" (current-buffer)
-                                   "convert"
+                    (start-process "imagemagick" (current-buffer)
+                                   (or (executable-find "magick")
+                                       "convert")
                                    "png:-"
                                    "-gravity" "center"
                                    "-background" "white"