diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-08-13 16:40:36 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-08-13 16:40:36 +0200 |
| commit | e386c0ca2d6fc8866f26864b2ad2689ca0400f39 (patch) | |
| tree | 1192dc35516f2ba65e62845e5b9efae37de19df5 /lib | |
| parent | a9953b23cbc7327132df4da61f236413a828e6b5 (diff) | |
| parent | 10284487779ec3bf3656926d6692c6a9f38be81c (diff) | |
| download | otp-e386c0ca2d6fc8866f26864b2ad2689ca0400f39.tar.gz otp-e386c0ca2d6fc8866f26864b2ad2689ca0400f39.tar.bz2 otp-e386c0ca2d6fc8866f26864b2ad2689ca0400f39.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/tools/emacs/erlang.el | 4 | ||||
| -rw-r--r-- | lib/tools/emacs/test.erl.indented | 5 | ||||
| -rw-r--r-- | lib/tools/emacs/test.erl.orig | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el index 8eee1fd66a..6c723a5c1c 100644 --- a/lib/tools/emacs/erlang.el +++ b/lib/tools/emacs/erlang.el @@ -1486,7 +1486,7 @@ Other commands: ;; A dollar sign right before the double quote that ends a ;; string is not a character escape. ;; - ;; And a "string" has with a double quote not escaped by a + ;; And a "string" consists of a double quote not escaped by a ;; dollar sign, any number of non-backslash non-newline ;; characters or escaped backslashes, a dollar sign ;; (otherwise we wouldn't care) and a double quote. This @@ -1495,6 +1495,8 @@ Other commands: ;; know whether matching started inside a string: limiting ;; search to a single line keeps things sane. . (("\\(?:^\\|[^$]\\)\"\\(?:[^\"\n]\\|\\\\\"\\)*\\(\\$\\)\"" 1 "w") + ;; Likewise for atoms + ("\\(?:^\\|[^$]\\)'\\(?:[^'\n]\\|\\\\'\\)*\\(\\$\\)'" 1 "w") ;; And the dollar sign in $\" escapes two characters, not ;; just one. ("\\(\\$\\)\\\\\\\"" 1 "'")))))) diff --git a/lib/tools/emacs/test.erl.indented b/lib/tools/emacs/test.erl.indented index e0593c6522..45d9593000 100644 --- a/lib/tools/emacs/test.erl.indented +++ b/lib/tools/emacs/test.erl.indented @@ -215,6 +215,11 @@ highlighting(X) % Function definitions should be highlighted "char $in string", atom, + 'atom$', atom, 'atom$', atom, + 'atom\$', atom, + + 'char $in atom', atom, + $[, ${, $\\, atom, ?MACRO_1, ?MACRO_2(foo), diff --git a/lib/tools/emacs/test.erl.orig b/lib/tools/emacs/test.erl.orig index 69356aca9e..e123150dd1 100644 --- a/lib/tools/emacs/test.erl.orig +++ b/lib/tools/emacs/test.erl.orig @@ -215,6 +215,11 @@ highlighting(X) % Function definitions should be highlighted "char $in string", atom, + 'atom$', atom, 'atom$', atom, + 'atom\$', atom, + + 'char $in atom', atom, + $[, ${, $\\, atom, ?MACRO_1, ?MACRO_2(foo), |