From 3728b21d53bcd9309aff9494c0789367cab319e9 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Thu, 25 Jan 2007 01:46:13 +0000 Subject: r11585@ruby: shyouhei | 2007-01-25 10:32:12 +0900 * misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): fix regexp font-lock bug. [ruby-talk:235758] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@11573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ misc/ruby-mode.el | 2 +- version.h | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1d63d91f1..a7adc5881b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jan 24 18:05:39 2007 Yukihiro Matsumoto + + * misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): fix + regexp font-lock bug. [ruby-talk:235758] + Sun Jan 14 07:26:44 2007 Masaki Suketa * ext/win32ole/win32ole.c (ole_free, ole_type_free, diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index 12c60a1d84..4f41ec91a1 100644 --- a/misc/ruby-mode.el +++ b/misc/ruby-mode.el @@ -1010,7 +1010,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 07d3e15e40..67db66c2f7 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.5" -#define RUBY_RELEASE_DATE "2007-01-14" +#define RUBY_RELEASE_DATE "2007-01-24" #define RUBY_VERSION_CODE 185 -#define RUBY_RELEASE_CODE 20070114 -#define RUBY_PATCHLEVEL 15 +#define RUBY_RELEASE_CODE 20070124 +#define RUBY_PATCHLEVEL 16 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 5 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 14 +#define RUBY_RELEASE_DAY 24 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[]; -- cgit v1.2.3