diff options
author | Pierre Courtieu <Matafou@users.noreply.github.com> | 2016-12-14 11:39:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-14 11:39:42 +0100 |
commit | 9ef31c75a9133693ce462286c4c2aa6428cca06f (patch) | |
tree | 6b916cdc5255f8ab817b76843fa2e6039682f324 | |
parent | 1e506d9da3b05a5ec8c6ec5e91f17cf153cb6dfc (diff) | |
parent | 805c1b7ddc1a5c9254bc2252b2d87e79311d4521 (diff) |
Merge pull request #132 from Matafou/master
Remove default absolute name from coq-prog-name (Fixes #76), but keep displaying…
-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))) |