From 8110d523333c48d8a2fd7018d98e193a4f00dbcc Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 12 Nov 2007 04:54:00 +0000 Subject: [PATCH] * misc/ruby-mode.el (ruby-parse-partial): handle stringified symbols properly using ruby-forward-string. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13892 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ misc/ruby-mode.el | 5 +++-- version.h | 6 +++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e51b022fc0..28561fba95 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 12 13:53:06 2007 Yukihiro Matsumoto + + * misc/ruby-mode.el (ruby-parse-partial): handle stringified + symbols properly using ruby-forward-string. + Mon Nov 12 12:17:59 2007 Tanaka Akira * configure.in (MINIDLNOBJS): defined. diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index 6e9ac7ae45..bc7284a94f 100644 --- a/misc/ruby-mode.el +++ b/misc/ruby-mode.el @@ -506,8 +506,9 @@ The variable ruby-indent-level controls the amount of indentation. (setq nest (cons (cons nil pnt) nest)) (setq depth (1+ depth))) (goto-char pnt)) - ((looking-at ":\\(['\"]\\)\\(\\\\.\\|[^\\\\]\\)*\\1") - (goto-char (match-end 0))) + ((looking-at ":\\(['\"]\\)") + (goto-char (match-beginning 1)) + (ruby-forward-string (buffer-substring (match-beginning 1) (match-end 1)) end)) ((looking-at ":\\([-,.+*/%&|^~<>]=?\\|===?\\|<=>\\)") (goto-char (match-end 0))) ((looking-at ":\\([a-zA-Z_][a-zA-Z_0-9]*[!?=]?\\)?") diff --git a/version.h b/version.h index f33ba4cbec..35975c4107 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-11-10" +#define RUBY_RELEASE_DATE "2007-11-12" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20071110 +#define RUBY_RELEASE_CODE 20071112 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 10 +#define RUBY_RELEASE_DAY 12 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[];