aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-01-25 10:27:06 +0100
committerFredrik Gustafsson <[email protected]>2013-01-25 10:27:06 +0100
commit01935bc282651d76188b306fb0df7396f81584f7 (patch)
treecbccf041767015b4f816ffcb5e20cfef772d1eec
parent06fc4b8586e530e1f462bb1761ff5d9bce681dad (diff)
parentf8223c00297beb3764b2cc1a70e2e8ac81b74d76 (diff)
downloadotp-01935bc282651d76188b306fb0df7396f81584f7.tar.gz
otp-01935bc282651d76188b306fb0df7396f81584f7.tar.bz2
otp-01935bc282651d76188b306fb0df7396f81584f7.zip
Merge branch 'mh/fix-highlighting-dollar-backslash-singlequote/OTP-10766'
* mh/fix-highlighting-dollar-backslash-singlequote/OTP-10766: Fix syntax highlighting of $\' in Emacs mode
-rw-r--r--lib/tools/emacs/erlang.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el
index 2967acf310..d473611eaf 100644
--- a/lib/tools/emacs/erlang.el
+++ b/lib/tools/emacs/erlang.el
@@ -1518,9 +1518,9 @@ Other commands:
. (("\\(?:^\\|[^$]\\)\"\\(?:[^\"\n]\\|\\\\\"\\)*\\(\\$\\)\"" 1 "w")
;; Likewise for atoms
("\\(?:^\\|[^$]\\)'\\(?:[^'\n]\\|\\\\'\\)*\\(\\$\\)'" 1 "w")
- ;; And the dollar sign in $\" escapes two characters, not
- ;; just one.
- ("\\(\\$\\)\\\\\\\"" 1 "'"))))))
+ ;; And the dollar sign in $\" or $\' escapes two
+ ;; characters, not just one.
+ ("\\(\\$\\)\\\\[\"']" 1 "'"))))))