yugui	2011-01-16 21:35:01 +0900 (Sun, 16 Jan 2011)

  New Revision: 30568

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

  Log:
    merges r30484 from trunk into ruby_1_9_2.
    --
    * misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): highlight
      regexp after open bracket.  [ruby-core:34183]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/misc/ruby-mode.el
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30567)
+++ ruby_1_9_2/ChangeLog	(revision 30568)
@@ -1,3 +1,8 @@
+Fri Jan  7 21:54:04 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): highlight
+	  regexp after open bracket.  [ruby-core:34183]
+
 Thu Jan  6 22:42:02 2011  Yukihiro Matsumoto  <matz@r...>
 
 	* bignum.c (bigmul1_karatsuba): avoid overflow that make assertion
Index: ruby_1_9_2/misc/ruby-mode.el
===================================================================
--- ruby_1_9_2/misc/ruby-mode.el	(revision 30567)
+++ ruby_1_9_2/misc/ruby-mode.el	(revision 30568)
@@ -1184,7 +1184,7 @@
           ;; ?' ?" ?` are ascii codes
           ("\\(^\\|[^\\\\]\\)\\(\\\\\\\\\\)*[?$]\\([#\"'`]\\)" 3 (1 . nil))
           ;; regexps
-          ("\\(^\\|[=(,~?:;<>]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
+          ("\\(^\\|[[=(,~?:;<>]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
            (4 (7 . ?/))
            (6 (7 . ?/)))
           ("^\\(=\\)begin\\(\\s \\|$\\)" 1 (7 . nil))
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30567)
+++ ruby_1_9_2/version.h	(revision 30568)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 148
+#define RUBY_PATCHLEVEL 149
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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