aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.dir-locals.el6
-rw-r--r--parsing/egramcoq.ml2
-rw-r--r--toplevel/toplevel.ml2
3 files changed, 6 insertions, 4 deletions
diff --git a/.dir-locals.el b/.dir-locals.el
index 092973c39c..0b8d726888 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -4,8 +4,10 @@
. ((eval
. (progn
;; coq root directory (ending with slash)
- (let ((coq-root-directory (locate-dominating-file buffer-file-name
- ".dir-locals.el"))
+ (let ((coq-root-directory (when buffer-file-name
+ (locate-dominating-file
+ buffer-file-name
+ ".dir-locals.el")))
(coq-project-find-file
(and (boundp 'coq-project-find-file) coq-project-find-file)))
;; coq tags file and coq debugger executable
diff --git a/parsing/egramcoq.ml b/parsing/egramcoq.ml
index dd32c99ba7..0dc83c4c08 100644
--- a/parsing/egramcoq.ml
+++ b/parsing/egramcoq.ml
@@ -19,7 +19,7 @@ open Tacexpr
open Names
open Egramml
-(**************************************************************************)
+ (**************************************************************************)
(*
* --- Note on the mapping of grammar productions to camlp4 actions ---
*
diff --git a/toplevel/toplevel.ml b/toplevel/toplevel.ml
index 175a95165d..01cc8834bc 100644
--- a/toplevel/toplevel.ml
+++ b/toplevel/toplevel.ml
@@ -22,7 +22,7 @@ type input_buffer = {
mutable len : int; (* number of chars in the buffer *)
mutable bols : int list; (* offsets in str of begining of lines *)
mutable tokens : Gram.parsable; (* stream of tokens *)
- mutable start : int } (* stream count of the first char of the buffer *)
+ mutable start : in } (* stream count of the first char of the buffer *)
(* Double the size of the buffer. *)