diff options
author | Pierre Weis <Pierre.Weis@inria.fr> | 2000-12-28 13:07:42 +0000 |
---|---|---|
committer | Pierre Weis <Pierre.Weis@inria.fr> | 2000-12-28 13:07:42 +0000 |
commit | 2116da4220acde3fdf11ac0ef0100e0166729bcd (patch) | |
tree | 3d09bdc4675c58823863bfe12c05e6cdd490d6f0 /otherlibs/labltk/browser/shell.ml | |
parent | 447c79eadec7db87abc782735c5b06ed4fd020e4 (diff) |
Getting rid of obsolete boolean operators & and or
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3359 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'otherlibs/labltk/browser/shell.ml')
-rw-r--r-- | otherlibs/labltk/browser/shell.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/otherlibs/labltk/browser/shell.ml b/otherlibs/labltk/browser/shell.ml index b98a588d4..30870cf98 100644 --- a/otherlibs/labltk/browser/shell.ml +++ b/otherlibs/labltk/browser/shell.ml @@ -143,7 +143,7 @@ object (self) self#lex ~start:(idx,[`Linestart]) (); Text.see textw ~index:(`Mark"insert",[]) method private keypress c = - if not reading & c > " " then begin + if not reading && c > " " then begin reading <- true; Text.mark_set textw ~mark:"input" ~index:(`Mark"insert",[`Char(-1)]) end @@ -330,7 +330,7 @@ let f ~prog ~title = if l = [] then () else let name = List.hd l in current_dir := Filename.dirname name; - if Filename.check_suffix name ".cmo" or + if Filename.check_suffix name ".cmo" || Filename.check_suffix name ".cma" then let cmd = "#load \"" ^ name ^ "\";;\n" in |