[nongnu] externals/caml 9fd72d7 029/197: nouvelle syntaxe avec tilde

[Stefan Monnier]

branch: externals/caml
commit 9fd72d71f0e22f38f9dc062fce67957abef8b1fd
Author: Jacques Garrigue <garrigue at math.nagoya-u.ac.jp>
Commit: Jacques Garrigue <garrigue at math.nagoya-u.ac.jp>

    nouvelle syntaxe avec tilde
    
    
    git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3061 
f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 caml-font.el | 4 ++--
 caml.el      | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/caml-font.el b/caml-font.el
index b5c58df..e190f74 100644
--- a/caml-font.el
+++ b/caml-font.el
@@ -43,9 +43,9 @@
                  "\\|\"[^\"\\]*\\(\\\\\\(.\\|\n\\)[^\"\\]*\\)*\"")
          'font-lock-string-face)
 ;labels (and open)
-   '("\\(\\<[A-Za-z][A-Za-z0-9_']*:\\)\\([^:=]\\|\\'\\|$\\)" 1
+   '("\\(\\([~?]\\|\\<\\)[a-z][a-z0-9_']*:\\)[^:=]" 1
      font-lock-variable-name-face)
-   '("\\<\\(assert\\|open\\|include\\|:[A-Za-z][A-Za-z0-9_']*\\)\\>\\|?"
+   '("\\<\\(assert\\|open\\|include\\)\\>\\|[~?][ (]*[a-z][a-z0-9_']*"
      . font-lock-variable-name-face)
 ;modules and constructors
    '("\\(\\<\\|:\\)\\([A-Z][A-Za-z0-9_']*\\)\\>"
diff --git a/caml.el b/caml.el
index 5457060..795ac17 100644
--- a/caml.el
+++ b/caml.el
@@ -15,8 +15,8 @@
 (defvar caml-imenu-enable nil
   "*Enable Imenu support.")
 
-(defvar caml-olabl-disable nil
-  "*Disable O'Labl support")
+(defvar caml-olabl-enable nil
+  "*Enable O'Labl support")
 
 (defvar caml-mode-indentation 2
   "*Used for \\[caml-unindent-command].")
@@ -369,8 +369,7 @@ have caml-electric-indent on, which see.")
   (modify-syntax-entry ?' "w" caml-mode-syntax-table)
   (modify-syntax-entry ?_ "w" caml-mode-syntax-table)
   ; : is part of words (labels) in O'Labl
-  (if caml-olabl-disable nil
-    (modify-syntax-entry ?: "w" caml-mode-syntax-table))
+  (if caml-olabl-enable (modify-syntax-entry ?: "w" caml-mode-syntax-table))
   ; ISO-latin accented letters and EUC kanjis are part of words
   (let ((i 160))
     (while (< i 256)