showterm.el: use new magick command by default, fallback to convert

diff --git a/tools/showterm.el b/tools/showterm.el
index 37cde277db3dfeac3e9146b83a1f2d46c339eb68..684cc1721237ccea957dbf03c28520b44a6e882a 100644 (file)
--- 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"