diff options
| author | schinz <schinz@epfl.ch> | 2003-04-02 08:11:28 +0000 |
|---|---|---|
| committer | schinz <schinz@epfl.ch> | 2003-04-02 08:11:28 +0000 |
| commit | fee56a72018990ffc943488f64b9236137e4a513 (patch) | |
| tree | 8cc63451bdb0677b614b3d828a99237fd0860cae /support/emacs | |
| parent | d7c9373e8553f9cd4bb22b8c31a7d97193c2a4c3 (diff) | |
| download | scala-fee56a72018990ffc943488f64b9236137e4a513.tar.gz scala-fee56a72018990ffc943488f64b9236137e4a513.tar.bz2 scala-fee56a72018990ffc943488f64b9236137e4a513.zip | |
- added "object" as an equivalent to "module"
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 0df24d5a40..4e5611bd23 100644 --- a/support/emacs/scala-mode.el +++ b/support/emacs/scala-mode.el @@ -62,7 +62,7 @@ reserved keywords when used alone.") (defconst scala-keywords-re (regexp-opt '("abstract" "as" "case" "class" "def" "do" "else" "extends" "final" "for" "if" "import" "is" - "let" "module" "new" "override" "outer" + "let" "module" "new" "override" "object" "outer" "package" "private" "protected" "qualified" "trait" "type" "val" "var" "with" "yield" "null" "this" "super") @@ -466,8 +466,8 @@ When called repeatedly, indent each time one stop further on the right." nil) ;; modules - (,(concat "\\<module\\>\\s *\\(" scala-ident-re "\\)") - (1 font-lock-variable-name-face nil)) + (,(concat "\\<\\(module\\|object\\)\\>\\s *\\(" scala-ident-re "\\)") + (2 font-lock-variable-name-face nil)) ;; type definitions (,(concat "\\<type\\>\\s *\\(" scala-ident-re "\\)") |