aboutsummaryrefslogtreecommitdiffhomepage
path: root/coq
diff options
context:
space:
mode:
authorGravatar Pierre Courtieu <courtieu@lri.fr>2008-05-22 08:23:52 +0000
committerGravatar Pierre Courtieu <courtieu@lri.fr>2008-05-22 08:23:52 +0000
commitf26065599679034ef69d9049652beaafa540fa30 (patch)
tree4a91d4400cef66be8570f8ab020940db36f3b0ee /coq
parent91b0057e6994708f39b8ebde6dd14cb55de52f5d (diff)
Fixed a bug with local variable setting.
Diffstat (limited to 'coq')
-rw-r--r--coq/coq-local-vars.el5
-rw-r--r--coq/coq.el2
2 files changed, 4 insertions, 3 deletions
diff --git a/coq/coq-local-vars.el b/coq/coq-local-vars.el
index effa3d02..deaed341 100644
--- a/coq/coq-local-vars.el
+++ b/coq/coq-local-vars.el
@@ -78,8 +78,9 @@ Set them to PROGNAME and PROGARGS respectively. These variables describe the
coqtop command to be launched on this file."
(local-vars-list-set 'coq-prog-name progname)
(local-vars-list-set 'coq-prog-args progargs)
- (setq proof-prog-name progname)
- (setq proof-prog-args progargs))
+ ;; coq-guess-command-line uses coq-prog-name, so set it
+ (setq coq-prog-name progname)
+ (setq coq-prog-args progargs))
(defun coq-read-directory (prompt &optional default maynotmatch initialcontent)
diff --git a/coq/coq.el b/coq/coq.el
index d9d56d48..0b9d8c34 100644
--- a/coq/coq.el
+++ b/coq/coq.el
@@ -788,7 +788,7 @@ This is specific to `coq-mode'."
(defun coq-guess-command-line (filename)
"Guess the right command line options to compile FILENAME using `make -n'."
(if (local-variable-p 'coq-prog-name (current-buffer)) coq-prog-name
- (let ((dir (file-name-directory filename))
+ (let ((dir (or (file-name-directory filename) "."))
(makedir
(cond
((file-exists-p (concat dir "Makefile")) ".")