diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2010-04-08 03:25:36 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2010-04-08 03:25:36 +0000 |
| commit | 3f3da268369d87debe47f10bb54590ba2c69d68c (patch) | |
| tree | a96d213beb6bfe921ca5934a5da28709a3f4ff08 | |
| parent | 48c2907a1a8d4b31f56d78c3593363e244e381c0 (diff) | |
| download | ocaml-override.tar.gz | |
revert unnecessary changesoverride
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/override@10249 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | camlp4/Camlp4/Struct/Camlp4Ast.mlast | 12 | ||||
| -rw-r--r-- | emacs/caml-font.el | 4 | ||||
| -rw-r--r-- | emacs/caml-hilit.el | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/camlp4/Camlp4/Struct/Camlp4Ast.mlast b/camlp4/Camlp4/Struct/Camlp4Ast.mlast index cb8dd4a40b..6c4ea3bc8a 100644 --- a/camlp4/Camlp4/Struct/Camlp4Ast.mlast +++ b/camlp4/Camlp4/Struct/Camlp4Ast.mlast @@ -518,26 +518,26 @@ module Make (Loc : Sig.Loc) value map_expr f = object inherit map as super; - method override expr x = f (super#expr x); + method expr x = f (super#expr x); end; value map_patt f = object inherit map as super; - method override patt x = f (super#patt x); + method patt x = f (super#patt x); end; value map_ctyp f = object inherit map as super; - method override ctyp x = f (super#ctyp x); + method ctyp x = f (super#ctyp x); end; value map_str_item f = object inherit map as super; - method override str_item x = f (super#str_item x); + method str_item x = f (super#str_item x); end; value map_sig_item f = object inherit map as super; - method override sig_item x = f (super#sig_item x); + method sig_item x = f (super#sig_item x); end; value map_loc f = object inherit map as super; - method override loc x = f (super#loc x); + method loc x = f (super#loc x); end; end; diff --git a/emacs/caml-font.el b/emacs/caml-font.el index 41c730c663..e796abdcb7 100644 --- a/emacs/caml-font.el +++ b/emacs/caml-font.el @@ -45,8 +45,8 @@ (,(regexp-opt '("and" "as" "constraint" "class" "exception" "external" "fun" "function" "functor" "in" "inherit" "initializer" "let" - "method" "mutable" "module" "of" "override" "private" - "rec" "type" "val" "virtual") + "method" "mutable" "module" "of" "private" "rec" + "type" "val" "virtual") 'words) . font-lock-type-face) ;blocking diff --git a/emacs/caml-hilit.el b/emacs/caml-hilit.el index 37043bc0af..697e58173d 100644 --- a/emacs/caml-hilit.el +++ b/emacs/caml-hilit.el @@ -40,7 +40,7 @@ "\\<\\(a\\(nd\\|s\\)\\|c\\(onstraint\\|lass\\)" "\\|ex\\(ception\\|ternal\\)\\|fun\\(ct\\(ion\\|or\\)\\)?" "\\|in\\(herit\\)?\\|let\\|m\\(ethod\\|utable\\|odule\\)" - "\\|o\\(f\\|verride\\)\\|p\\(arser\\|rivate\\)\\|rec\\|type" + "\\|of\\|p\\(arser\\|rivate\\)\\|rec\\|type" "\\|v\\(al\\|irtual\\)\\)\\>") nil 'ForestGreen) ;blocking |