summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-06 22:33:43 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-06 22:33:43 +0000
commit3f3584d6239ae3177c83523c8ac7398ce4d5e2ae (patch)
treefd1f5a3cbf2f2b8315522eb6753096c28caeb497 /misc
parentce231cdbdd21b82dd3e3753d03fc4275ec346208 (diff)
* misc/ruby-mode.el: don't highlight keywords when they're the
beginning of non-keyword symbols. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'misc')
-rw-r--r--misc/ruby-mode.el9
1 files changed, 4 insertions, 5 deletions
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index e37cc4eab8..996df17f53 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)