diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-12 04:55:19 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-12 04:55:19 +0000 |
commit | 8343f008c1eedd975797203b2d09b0385bd13abd (patch) | |
tree | 54bedecbd60107ef68f03c98441bb7c8a686c60d | |
parent | 5c07f0fa4dedf5a4337e1ff70d7161701cb71ad9 (diff) |
* 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/branches/ruby_1_8@13893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | misc/ruby-mode.el | 5 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Mon Nov 12 13:53:06 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * misc/ruby-mode.el (ruby-parse-partial): handle stringified + symbols properly using ruby-forward-string. + Mon Nov 12 12:38:31 2007 Tanaka Akira <akr@fsij.org> * Makefile.in (lex.c): don't remove lex.c at first. diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el index 25c6b3008d..b9cd9e313a 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]*[!?=]?\\)?") @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-11-09" +#define RUBY_RELEASE_DATE "2007-11-12" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20071109 +#define RUBY_RELEASE_CODE 20071112 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 9 +#define RUBY_RELEASE_DAY 12 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |