From 357bdaebde0a162cd77d108ffdfae428080a3887 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 16 Jan 2011 12:35:01 +0000 Subject: [PATCH] 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ misc/ruby-mode.el | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc70b4cd06..da9e82e8bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 7 21:54:04 2011 Nobuyoshi Nakada + + * 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 * bignum.c (bigmul1_karatsuba): avoid overflow that make assertion diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index 0072f1e0d5..8df37d2f88 100644 --- a/misc/ruby-mode.el +++ b/misc/ruby-mode.el @@ -1184,7 +1184,7 @@ balanced expression is found." ;; ?' ?" ?` 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)) diff --git a/version.h b/version.h index 3277ff640a..99eb0249ec 100644 --- a/version.h +++ b/version.h @@ -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