matz	2008-09-07 07:33:43 +0900 (Sun, 07 Sep 2008)

  New Revision: 19204

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19204

  Log:
    * misc/ruby-mode.el: don't highlight keywords when they're the
      beginning of non-keyword symbols.

  Modified files:
    trunk/ChangeLog
    trunk/misc/ruby-mode.el

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19203)
+++ ChangeLog	(revision 19204)
@@ -8,6 +8,9 @@
 	* 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@r...>
 
 	* file.c (file_expand_path): applied a patch from Nobuhiro Tachino
Index: misc/ruby-mode.el
===================================================================
--- misc/ruby-mode.el	(revision 19203)
+++ misc/ruby-mode.el	(revision 19204)
@@ -1236,9 +1236,8 @@
        1 font-lock-function-name-face)
      ;; keywords
      (cons (concat
-	    "\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(defined\\?\\|\\("
-	    (mapconcat
-	     'identity
+	    "\\(^\\|[^_:.@$]\\|\\.\\.\\)\\b\\(defined\\?\\|"
+	    (regexp-opt
 	     '("alias"
 	       "and"
 	       "begin"
@@ -1275,8 +1274,8 @@
 	       "while"
 	       "yield"
 	       )
-	     "\\|")
-	    "\\)\\>\\)")
+             t)
+	    "\\_>\\)")
 	   2)
      ;; here-doc beginnings
      (list ruby-here-doc-beg-re 0 'font-lock-string-face)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/