diff options
| author | schinz <schinz@epfl.ch> | 2004-02-03 07:42:05 +0000 |
|---|---|---|
| committer | schinz <schinz@epfl.ch> | 2004-02-03 07:42:05 +0000 |
| commit | 982254cf56a6a26d07016084a2e9e88594bc0177 (patch) | |
| tree | 901b8075fb1e6d9dfb71973f4207f87d7d4f135b /support/emacs | |
| parent | c11a8632c4052a608bb5318d57c44aade2afb8b7 (diff) | |
| download | scala-982254cf56a6a26d07016084a2e9e88594bc0177.tar.gz scala-982254cf56a6a26d07016084a2e9e88594bc0177.tar.bz2 scala-982254cf56a6a26d07016084a2e9e88594bc0177.zip | |
- changed the way character literals are highli...
- changed the way character literals are highlighted, to fix bug #285:
symbols should now highlight correctly as well as character literals,
except '\'' which I somehow don't manage to make work
Diffstat (limited to 'support/emacs')
| -rw-r--r-- | support/emacs/scala-mode.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/support/emacs/scala-mode.el b/support/emacs/scala-mode.el index b4fa16f58e..e927b21253 100644 --- a/support/emacs/scala-mode.el +++ b/support/emacs/scala-mode.el @@ -43,7 +43,7 @@ "Regular expression matching a Scala string literal.") (defconst scala-char-re - "'\\([^'\\\\]\\|\\\\.\\)*\'" + "'\\([^\\\\]\\|\\(\\\\[^']\\)\\)'" "Regular expression matching a Scala character literal.") (defconst scala-literal-re @@ -548,7 +548,8 @@ When called repeatedly, indent each time one stop further on the right." (defvar scala-font-lock-syntactic-keywords - '((scala-search-special-identifier-forward (0 "w" nil t)))) + `((,scala-char-re (0 "\"" t nil)) + (scala-search-special-identifier-forward (0 "w" nil nil)))) ;; Bug reporting @@ -677,7 +678,6 @@ When started, run `scala-mode-hook'. ;; strings and character literals (modify-syntax-entry ?\" "\"" scala-mode-syntax-table) -(modify-syntax-entry ?\' "\"" scala-mode-syntax-table) (modify-syntax-entry ?\\ "\\" scala-mode-syntax-table) ;; different kinds of "parenthesis" |