diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2011-05-20 07:40:01 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2011-05-20 07:40:01 +0000 |
| commit | 50210ab28ab325f96bc00fea0193278474322762 (patch) | |
| tree | 858e7970ac6f81de50e0670cd39bb63d6cca3f92 | |
| parent | 877df82b89fe6ce6501f7f1069ddc2e5d3ac31c7 (diff) | |
| download | ocaml-50210ab28ab325f96bc00fea0193278474322762.tar.gz | |
fix PR#5272
git-svn-id: http://caml.inria.fr/svn/ocaml/version/3.12@11055 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | emacs/caml-font.el | 2 | ||||
| -rw-r--r-- | emacs/caml.el | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/emacs/caml-font.el b/emacs/caml-font.el index f287ffa045..956225466d 100644 --- a/emacs/caml-font.el +++ b/emacs/caml-font.el @@ -59,7 +59,7 @@ . font-lock-builtin-face) ;control (,(concat "[|#&]\\|->\\|" - (regexp-opt '("do" "done" "dowto" "else" "for" "if" "ignore" + (regexp-opt '("do" "done" "downto" "else" "for" "if" "ignore" "lazy" "match" "new" "or" "then" "to" "try" "when" "while" "with") 'words)) diff --git a/emacs/caml.el b/emacs/caml.el index 56f174642e..2e37bff527 100644 --- a/emacs/caml.el +++ b/emacs/caml.el @@ -1161,7 +1161,7 @@ Used to distinguish it from toplevel let construct.") (defconst caml-matching-kw-regexp (concat - "\\<\\(and\\|do\\(ne\\)?\\|e\\(lse\\|nd\\)\\|in\\|t\\(hen\\|o\\)" + "\\<\\(and\\|do\\(ne\\|wnto\\)?\\|e\\(lse\\|nd\\)\\|in\\|t\\(hen\\|o\\)" "\\|with\\)\\>\\|[^[|]|") "Regexp used in caml mode for skipping back over nested blocks.") @@ -1176,6 +1176,7 @@ Used to distinguish it from toplevel let construct.") ("else" . caml-find-else-match) ("then" . caml-find-then-match) ("to" . caml-find-done-match) + ("downto" . caml-find-done-match) ("do" . caml-find-done-match) ("and" . caml-find-and-match)) @@ -1582,7 +1583,7 @@ Does not preserve point." (defconst caml-leading-kwops-regexp (concat - "\\<\\(and\\|do\\(ne\\)?\\|e\\(lse\\|nd\\)\\|in" + "\\<\\(and\\|do\\(ne\\|wnto\\)?\\|e\\(lse\\|nd\\)\\|in" "\\|t\\(hen\\|o\\)\\|with\\)\\>\\|[]|})]") "Regexp matching caml keywords which need special indentation.") @@ -1596,6 +1597,7 @@ Does not preserve point." ("in" caml-in-extra-indent 2) ("then" caml-then-extra-indent 3) ("to" caml-to-extra-indent 0) + ("downto" caml-to-extra-indent 0) ("with" caml-with-extra-indent 2) ("|" caml-|-extra-indent 2) ("]" caml-rb-extra-indent 0) |