procyberian/emacs
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Packages Wiki Activity Actions

Fix image-converter probes

Browse source 
* lisp/image/image-converter.el (image-converter--probe): Check
that the executable exists before trying to call it.
This commit is contained in:
Lars Ingebrigtsen 2019-10-30 01:02:43 +01:00
parent ba7755bfb7
commit 7ce00e9a8b
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/image/image-converter.el
View file

@ -100,9 +100,10 @@ where created with DATA-P nil (i.e., it has to refer to a file)."
(with-temp-buffer
(let ((command (image-converter--value type :command))
formats)
(when (zerop (apply #'call-process (car command) nil '(t nil) nil
(when (and (executable-find (car command))
(zerop (apply #'call-process (car command) nil '(t nil) nil
(append (cdr command)
(image-converter--value type :probe))))
(image-converter--value type :probe)))))
(goto-char (point-min))
(when (re-search-forward "^-" nil t)
(forward-line 1)
@ -119,8 +120,9 @@ where created with DATA-P nil (i.e., it has to refer to a file)."
formats)
;; Can't check return value; ImageMagick convert usually returns
;; a non-zero result on "-list format".
(when (executable-find (car command))
(apply #'call-process (car command) nil '(t nil) nil
(append (cdr command) (image-converter--value type :probe)))
(append (cdr command) (image-converter--value type :probe))))
(goto-char (point-min))
(when (re-search-forward "^-" nil t)
(forward-line 1)
@ -135,9 +137,10 @@ where created with DATA-P nil (i.e., it has to refer to a file)."
(with-temp-buffer
(let ((command (image-converter--value type :command))
formats)
(when (zerop (apply #'call-process (car command) nil '(t nil) nil
(when (and (executable-find (car command))
(zerop (apply #'call-process (car command) nil '(t nil) nil
(append (cdr command)
(image-converter--value type :probe))))
(image-converter--value type :probe)))))
(goto-char (point-min))
(when (re-search-forward "^ *-" nil t)
(forward-line 1)