rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3347 from drzv/im7-compat2

Browse Source 
showterm.el: use new magick command by default, fallback to convert
This commit is contained in:
Mark Thom
2026-05-28 16:34:52 -07:00
committed by GitHub
parent 149d3932be 36cbeb3d6c
commit 8b6d68a4cd
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/showterm.el
View File

@@ -6,7 +6,7 @@
;; ;;
;; - Scryer Prolog ;; - Scryer Prolog
;; - `dot' (from Graphviz) ;; - `dot' (from Graphviz)
;; - `convert' (from ImageMagick) ;; - `convert' or `magick' (from ImageMagick)
;; ;;
;; Copy showterm.el and showterm.pl to the same directory, ;; Copy showterm.el and showterm.pl to the same directory,
;; say ~/scryer-prolog/tools/, and add to your .emacs: ;; say ~/scryer-prolog/tools/, and add to your .emacs:
@@ -76,18 +76,17 @@
(setq str (buffer-string)) (setq str (buffer-string))
(erase-buffer)) (erase-buffer))
(let ((proc (let (process-connection-type) (let ((proc (let (process-connection-type)
(make-process :name "convert" (start-process "imagemagick" (current-buffer)
:buffer (current-buffer) (or (executable-find "magick")
:stderr " convert-stderr" "convert")
:command `("convert"
"png:-" "png:-"
"-gravity" "center" "-gravity" "center"
"-background" "white" "-background" "white"
"-scale" ,(format "%dx%d" "-scale" (format "%dx%d"
showterm-pixel-width showterm-pixel-width
showterm-pixel-width) showterm-pixel-width)
"-extent" ,(format "%dx" showterm-pixel-width) "-extent" (format "%dx" showterm-pixel-width)
"png:-"))))) "png:-"))))
(process-send-string proc str) (process-send-string proc str)
(process-send-eof proc) (process-send-eof proc)
(showterm-wait-for-process proc)) (showterm-wait-for-process proc))