1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* misc/ruby-mode.el (ruby-expr-beg, ruby-parse-partial): keyword

Browse Source 
followed by colon is label.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2011-02-07 15:53:15 +00:00
parent b50d85ebc6
commit 360e0b93fd
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Feb 8 00:53:14 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el (ruby-expr-beg, ruby-parse-partial): keyword
followed by colon is label.
Mon Feb 7 22:56:16 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com> Mon Feb 7 22:56:16 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
* lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of * lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of

3
misc/ruby-mode.el
View File

@ -467,7 +467,7 @@ The variable ruby-indent-level controls the amount of indentation.
ruby-block-mid-keywords) ruby-block-mid-keywords)
'words)) 'words))
(goto-char (match-end 0)) (goto-char (match-end 0))
(not (looking-at "\\s_"))) (not (looking-at "\\s_\\|[!?:]")))
((eq option 'expr-qstr) ((eq option 'expr-qstr)
(looking-at "[a-zA-Z][a-zA-z0-9_]* +%[^ \t]")) (looking-at "[a-zA-Z][a-zA-z0-9_]* +%[^ \t]"))
((eq option 'expr-re) ((eq option 'expr-re)
@ -639,6 +639,7 @@ The variable ruby-indent-level controls the amount of indentation.
(not (eq ?_ w)) (not (eq ?_ w))
(not (eq ?! w)) (not (eq ?! w))
(not (eq ?? w)) (not (eq ?? w))
(not (eq ?: w))
(skip-chars-forward " \t") (skip-chars-forward " \t")
(goto-char (match-beginning 0)) (goto-char (match-beginning 0))
(or (not (looking-at ruby-modifier-re)) (or (not (looking-at ruby-modifier-re))

4
version.h
View File

@ -1,11 +1,11 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_RELEASE_DATE "2011-02-07" #define RUBY_RELEASE_DATE "2011-02-08"
#define RUBY_PATCHLEVEL -1 #define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
#define RUBY_RELEASE_YEAR 2011 #define RUBY_RELEASE_YEAR 2011
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 7 #define RUBY_RELEASE_DAY 8
#include "ruby/version.h" #include "ruby/version.h"