summaryrefslogtreecommitdiff
path: root/lisp/doc-view.el
diff options
context:
space:
mode:
authorTassilo Horn <tsdh@gnu.org>2020-04-23 18:25:07 +0200
committerTassilo Horn <tsdh@gnu.org>2020-04-23 18:25:07 +0200
commit37ebec3a95cecd970c578e1955c940b3ad9f4e56 (patch)
tree5ae757f111865a4fbe15b04ed7138ba6f374d61f /lisp/doc-view.el
parentba6104d1e8db4e8db2f12acaebf092ef579c6632 (diff)
downloademacs-37ebec3a95cecd970c578e1955c940b3ad9f4e56.tar.gz
Improve the default value of 'doc-view-ghostscript-program'.
* lisp/doc-view.el (doc-view-ghostscript-program): Use plain command name instead of qualified name returned by executable-find (as suggested by Stefan Monnier). (Bug#36357)
Diffstat (limited to 'lisp/doc-view.el')
-rw-r--r--lisp/doc-view.el16
1 files changed, 7 insertions, 9 deletions
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 714fdf8b088..171a939d4ec 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -155,20 +155,18 @@
(defcustom doc-view-ghostscript-program
(cond
((memq system-type '(windows-nt ms-dos))
- (or
+ (cond
;; Windows Ghostscript
- (executable-find "gswin64c")
- (executable-find "gswin32c")
+ ((executable-find "gswin64c") "gswin64c")
+ ((executable-find "gswin32c") "gswin32c")
;; The GS wrapper coming with TeX Live
- (executable-find "rungs")
+ ((executable-find "rungs") "rungs")
;; The MikTeX builtin GS Check if mgs is functional for external
;; non-MikTeX apps. Was available under:
;; http://blog.miktex.org/post/2005/04/07/Starting-mgsexe-at-the-DOS-Prompt.aspx
- (when-let ((mgs (executable-find "mgs")))
- (when (= 0 (shell-command
- (concat (shell-quote-argument mgs)
- " -q -dNODISPLAY -c quit")))
- mgs))))
+ ((and (executable-find "mgs")
+ (= 0 (shell-command "mgs -q -dNODISPLAY -c quit")))
+ "mgs")))
(t "gs"))
"Program to convert PS and PDF files to PNG."
:type 'file