Commits

camlspotter committed 0521bed Merge

merge

Comments (0)

Files changed (13)

boot/myocamlbuild.boot

Binary file modified.

boot/ocamlc

Binary file modified.

boot/ocamldep

Binary file modified.

boot/ocamllex

Binary file modified.

byterun/io.c

File contents unchanged.

ocamldoc/odoc_analyse.ml

File contents unchanged.

ocamlspot/ocamlspot.el

    (encode-coding-string
     (ocamlspot-string-of-line-to-point) buffer-file-coding-system)))
 
-; It count one line less when the cursor is at (point-max) 
-; and it is at the top of the line.
 (defun ocamlspot-lines-of-point ()
-  (count-lines (point-min) (min (1+ (point)) (point-max))))
+  (count-lines (point-min) (point)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; column bytes => column chars
 

ocamlspot/ocamlspot.ml

         "--eager-dump", Arg.Set eager_dump, " eager evaluation at dump";
 
         "-n", Arg.Set no_definition_analysis, " no definition analysis";
-        "--no-analysis", Arg.Set no_definition_analysis, " no definition analysis";
-        
+        "--no-analysis", Arg.Set no_definition_analysis, " no definition
+        analysis";
+
         "-i", Arg.Set print_file_info, " print file information";
         "--info", Arg.Set print_file_info, " print file information";
 

ocamlspot/tests/Makefile.targets

 included_and_flat.cmo \
 inherit.cmo \
 inherit2.cmo \
+interface.cmo \
 intermodule.cmo \
 localvar.cmo \
 module.cmo \

ocamlspot/tests/interface.ml

+module M : sig 
+  exception E
+  val x : int
+end = struct
+  exception E
+  let x = 1
+  let _ = x
+end
+
+module N = struct
+  let y = 1
+end
+
+let _ = M.x
+let _ = N.y
+
+module O : sig
+  module P : sig
+    val z : int
+  end 
+end = struct
+  module P = struct
+    let z = 1
+  end
+end
+
+let _ = O.P.z

otherlibs/bigarray/mmap_unix.c

File contents unchanged.

otherlibs/unix/lseek.c

File contents unchanged.

typing/typemod.ml

File contents unchanged.