diff options
| -rw-r--r-- | coq/coq-system.el | 9 | ||||
| -rw-r--r-- | generic/proof-shell.el | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/coq/coq-system.el b/coq/coq-system.el index 2b8c9214..48757be5 100644 --- a/coq/coq-system.el +++ b/coq/coq-system.el @@ -30,7 +30,8 @@ On Windows you might need something like: :group 'coq) (defcustom coq-prog-name - (proof-locate-executable "coqtop" t '("C:/Program Files/Coq/bin")) + (if (executable-find "coqtop") "coqtop" + (proof-locate-executable "coqtop" t '("C:/Program Files/Coq/bin"))) "*Name of program to run as Coq. See `proof-prog-name', set from this. On Windows with latest Coq package you might need something like: C:/Program Files/Coq/bin/coqtop.opt.exe @@ -42,13 +43,15 @@ See also `coq-prog-env' to adjust the environment." :group 'coq) (defcustom coq-dependency-analyzer - (proof-locate-executable "coqdep" t '("C:/Program Files/Coq/bin")) + (if (executable-find "coqdep") "coqdep" + (proof-locate-executable "coqdep" t '("C:/Program Files/Coq/bin"))) "Command to invoke coqdep." :type 'string :group 'coq) (defcustom coq-compiler - (proof-locate-executable "coqc" t '("C:/Program Files/Coq/bin")) + (if (executable-find "coqc") "coqc" + (proof-locate-executable "coqc" t '("C:/Program Files/Coq/bin"))) "Command to invoke the coq compiler." :type 'string :group 'coq) diff --git a/generic/proof-shell.el b/generic/proof-shell.el index 6c0492aa..4cb46b0c 100644 --- a/generic/proof-shell.el +++ b/generic/proof-shell.el @@ -302,8 +302,10 @@ process command." (apply proof-guess-command-line (list name))))) (if proof-prog-name-ask - (setq proof-prog-name (read-shell-command "Run process: " - proof-prog-name))) + ;; if this option is set, an absolute file name is better to show if possible + (let ((prog-name (locate-file proof-prog-name exec-path exec-suffixes 1))) + (setq proof-prog-name (read-shell-command "Run process: " + prog-name)))) (let ((proc (downcase proof-assistant))) |