* 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
This commit is contained in:
matz 2008-09-06 22:33:43 +00:00
parent ce231cdbdd
commit 3f3584d623
2 changed files with 7 additions and 5 deletions

View File

@ -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 * misc/ruby-mode.el: don't crash the whole mode if the Subversion
$ keyword isn't interpolated. $ 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> Sun Sep 7 06:31:51 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* file.c (file_expand_path): applied a patch from Nobuhiro Tachino * file.c (file_expand_path): applied a patch from Nobuhiro Tachino

View File

@ -1236,9 +1236,8 @@ buffer position `limit' or the end of the buffer."
1 font-lock-function-name-face) 1 font-lock-function-name-face)
;; keywords ;; keywords
(cons (concat (cons (concat
"\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(defined\\?\\|\\(" "\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(defined\\?\\|"
(mapconcat (regexp-opt
'identity
'("alias" '("alias"
"and" "and"
"begin" "begin"
@ -1275,8 +1274,8 @@ buffer position `limit' or the end of the buffer."
"while" "while"
"yield" "yield"
) )
"\\|") t)
"\\)\\>\\)") "\\_>\\)")
2) 2)
;; here-doc beginnings ;; here-doc beginnings
(list ruby-here-doc-beg-re 0 'font-lock-string-face) (list ruby-here-doc-beg-re 0 'font-lock-string-face)