[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] externals/caml d3bc724 167/197: caml.el: Pass the `system` flag
From: |
Stefan Monnier |
Subject: |
[nongnu] externals/caml d3bc724 167/197: caml.el: Pass the `system` flag when defining abbrevs |
Date: |
Sat, 21 Nov 2020 01:20:00 -0500 (EST) |
branch: externals/caml
commit d3bc7240f297fddb4bbb46c1b8817876b0406db8
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Gabriel Scherer <gabriel.scherer@gmail.com>
caml.el: Pass the `system` flag when defining abbrevs
Avoids problems such as tuareg#146:
https://github.com/ocaml/tuareg/issues/146
---
caml.el | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/caml.el b/caml.el
index 2b6645f..80a4546 100644
--- a/caml.el
+++ b/caml.el
@@ -432,15 +432,10 @@ have caml-electric-indent on, which see.")
(defvar caml-mode-abbrev-table nil
"Abbrev table used for Caml mode buffers.")
(if caml-mode-abbrev-table nil
- (setq caml-mode-abbrev-table (make-abbrev-table))
- (define-abbrev caml-mode-abbrev-table "and" "and" 'caml-abbrev-hook)
- (define-abbrev caml-mode-abbrev-table "do" "do" 'caml-abbrev-hook)
- (define-abbrev caml-mode-abbrev-table "done" "done" 'caml-abbrev-hook)
- (define-abbrev caml-mode-abbrev-table "else" "else" 'caml-abbrev-hook)
- (define-abbrev caml-mode-abbrev-table "end" "end" 'caml-abbrev-hook)
- (define-abbrev caml-mode-abbrev-table "in" "in" 'caml-abbrev-hook)
- (define-abbrev caml-mode-abbrev-table "then" "then" 'caml-abbrev-hook)
- (define-abbrev caml-mode-abbrev-table "with" "with" 'caml-abbrev-hook))
+ (define-abbrev-table 'caml-mode-abbrev-table
+ (mapcar (lambda (keyword)
+ `(,keyword ,keyword caml-abbrev-hook nil t))
+ '("and" "do" "done" "else" "end" "in" "then" "with"))))
;; Other internal variables
- [nongnu] externals/caml f6a12d8 149/197: merge patch by Stefan Monnier from PR#5884, (continued)
- [nongnu] externals/caml f6a12d8 149/197: merge patch by Stefan Monnier from PR#5884, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml f6cd0b9 078/197: petit nettoyage, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 474e6ee 102/197: only set type faces where needed, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml b1eaaab 115/197: merge changes 3.10.0 -> 3.10.1, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 43a83dc 118/197: bug string-to-number, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml c525bf8 121/197: clean up spaces and tabs, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 73599dd 129/197: uniform .ignore system, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml eec3351 144/197: do byte-compile file caml-font.el, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml b1139bc 146/197: merge version/4.00 at revision 12866, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml b5bf207 160/197: update caml-font.el to deal with the quoted string syntax, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml d3bc724 167/197: caml.el: Pass the `system` flag when defining abbrevs,
Stefan Monnier <=
- [nongnu] externals/caml c0b7050 163/197: caml-types.el: Cosmetic changes., Stefan Monnier, 2020/11/21
- [nongnu] externals/caml f9a4fd4 177/197: makefiles: turn the 'install' command into a variable, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 2bc0b92 178/197: factorize common makefile definitions in Makefile.common, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 78b3169 182/197: Move config/Makefile to Makefile.config, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 9288416 183/197: Introduce and use ROOTDIR in more makefiles, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 1756296 140/197: PR#5137: caml-types-explore does not work, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 02303ea 147/197: PR#5727: emacs caml-mode indents shebang line in toplevel scripts, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 2c3dbdb 157/197: merge branch 4.02 from 4.02.1 (rev 15540) to a few fixes after 4.02.2 (rev 16205), Stefan Monnier, 2020/11/21
- [nongnu] externals/caml ed94de1 159/197: simplify .gitignore; remove .ignore files and tools/setignore; adjust tools/check-typo, Stefan Monnier, 2020/11/21
- [nongnu] externals/caml 66c8274 050/197: run caml directly, Stefan Monnier, 2020/11/21