diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-06 22:33:43 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-06 22:33:43 +0000 |
| commit | e8c8be6e8864cebe09e83737b49141b4a7078a11 (patch) | |
| tree | fd1f5a3cbf2f2b8315522eb6753096c28caeb497 | |
| parent | a8609b1ed14f9f383c73c6a3ec3a9a5df5bef23b (diff) | |
| download | ruby-e8c8be6e8864cebe09e83737b49141b4a7078a11.tar.gz ruby-e8c8be6e8864cebe09e83737b49141b4a7078a11.tar.xz ruby-e8c8be6e8864cebe09e83737b49141b4a7078a11.zip | |
* misc/ruby-mode.el: don't highlight keywords when they're the
beginning of non-keyword symbols.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | misc/ruby-mode.el | 9 |
2 files changed, 7 insertions, 5 deletions
@@ -8,6 +8,9 @@ Sun Sep 7 07:24:09 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * misc/ruby-mode.el: don't crash the whole mode if the Subversion $ keyword isn't interpolated. + * misc/ruby-mode.el: don't highlight keywords when they're the + beginning of non-keyword symbols. + Sun Sep 7 06:31:51 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * file.c (file_expand_path): applied a patch from Nobuhiro Tachino diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index e37cc4eab..996df17f5 100644 --- a/misc/ruby-mode.el +++ b/misc/ruby-mode.el @@ -1236,9 +1236,8 @@ buffer position `limit' or the end of the buffer." 1 font-lock-function-name-face) ;; keywords (cons (concat - "\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(defined\\?\\|\\(" - (mapconcat - 'identity + "\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(defined\\?\\|" + (regexp-opt '("alias" "and" "begin" @@ -1275,8 +1274,8 @@ buffer position `limit' or the end of the buffer." "while" "yield" ) - "\\|") - "\\)\\>\\)") + t) + "\\_>\\)") 2) ;; here-doc beginnings (list ruby-here-doc-beg-re 0 'font-lock-string-face) |