[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] externals/caml 9fd72d7 029/197: nouvelle syntaxe avec tilde
From: |
Stefan Monnier |
Subject: |
[nongnu] externals/caml 9fd72d7 029/197: nouvelle syntaxe avec tilde |
Date: |
Sat, 21 Nov 2020 01:19:32 -0500 (EST) |
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)
- [nongnu] externals/caml 9aa847d 020/197: intelligent indentation of parenthesis, (continued)
- [nongnu] externals/caml 9aa847d 020/197: intelligent indentation of parenthesis, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml a047a61 021/197: log, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 56915cb 025/197: Changement de la licence, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 55eef02 032/197: wrong regexp, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 805e07c 012/197: Fichier oublie, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 98d5eef 024/197: refinements, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml a5cc236 014/197: Ajustement de caml-next-error a` partir des versions 20, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 5c2d3d7 015/197: Enlever caml-emacs-twenty, pas necessaire, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 53fb026 016/197: MAJ avec ocaml-mode 2.01 de Jacques Garrigue, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 2694442 023/197: MAJ avec la derniere version de Jacques, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 9fd72d7 029/197: nouvelle syntaxe avec tilde,
Stefan Monnier <=
- [nongnu] externals/caml 51403bf 028/197: MacOS: ajout macosunix; portage bigarray et systhreads; tabs, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 7b99dbc 030/197: update labels, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 479db1e 031/197: changes, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 0a919f4 034/197: patch par Didier le Botlan pour les commentaires, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 6af733d 036/197: passage aux labels stricts, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 2eeca2e 039/197: xemacs keybind (PR#631), Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 39cfb2e 049/197: define only if needed, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 9d5668c 051/197: fix caml-help, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml d2f1cc7 052/197: better interaction with toplevel, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 495ee65 053/197: caml-find-phrase, Stefan Monnier, 2020/11/21