Silence compilation warning by avoiding some deprecated constructs.

2 files changed, 2 insertions, 2 deletions

diff --git a/ide/nanoPG.ml b/ide/nanoPG.ml
index dafb0575d3..fe9e815c90 100644
--- a/ide/nanoPG.ml
+++ b/ide/nanoPG.ml
@@ -64,7 +64,7 @@ let make_emacs_mode gui name enter_sym bindings =
 let compile_emacs_modes gui l =
   List.fold_left (fun (r,s,u,m,d) mode ->
     let run, set, unset, mask,doc = mode gui in
-    (fun k -> r k || run k), (fun k -> s k or set k),
+    (fun k -> r k || run k), (fun k -> s k || set k),
     (fun () -> u (); unset ()), (fun k -> m k || mask k), d^"\n"^doc)
   ((fun _ -> false),(fun _ -> false),(fun () -> ()),(fun _ -> false),"") l
 
diff --git a/ide/wg_Completion.ml b/ide/wg_Completion.ml
index 7317f1abc8..43564ba57e 100644
--- a/ide/wg_Completion.ml
+++ b/ide/wg_Completion.ml
@@ -60,7 +60,7 @@ let is_substring s1 s2 =
   let i = ref 0 in
   let len1 = Array.length s1 in
   let len2 = Array.length s2 in
-  while !break && !i < len1 & !i < len2 do
+  while !break && !i < len1 && !i < len2 do
     break := s1.(!i) = s2.(!i);
     incr i;
   done;