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