Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixing emacs diff bug with .dir-locals.el.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15974 85f007b7-540e-0410-9357-904b9bb8a0f7
  • Loading branch information...
commit 86b4195557d08055da97d292325fcdee333acea8 1 parent e68a6d0
courtieu authored
Showing with 6 additions and 4 deletions.
  1. +4 −2 .dir-locals.el
  2. +1 −1  parsing/egramcoq.ml
  3. +1 −1  toplevel/toplevel.ml
View
6 .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
View
2  parsing/egramcoq.ml
@@ -19,7 +19,7 @@ open Tacexpr
open Names
open Egramml
-(**************************************************************************)
+ (**************************************************************************)
(*
* --- Note on the mapping of grammar productions to camlp4 actions ---
*
View
2  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. *)
Please sign in to comment.
Something went wrong with that request. Please try again.