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

  followed by colon is label.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30818 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 1ea01e3e08..2900259cc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index 0e1e49f22b..3b0103c3a0 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -467,7 +467,7 @@ The variable ruby-indent-level controls the amount of indentation.
                                         ruby-block-mid-keywords)
                                 'words))
                    (goto-char (match-end 0))
-                   (not (looking-at "\\s_")))
+                   (not (looking-at "\\s_\\|[!?:]")))
                   ((eq option 'expr-qstr)
                    (looking-at "[a-zA-Z][a-zA-z0-9_]* +%[^ \t]"))
                   ((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))
          (skip-chars-forward " \t")
          (goto-char (match-beginning 0))
          (or (not (looking-at ruby-modifier-re))
diff --git a/version.h b/version.h
index 1194cdf929..7e421fae33 100644
--- a/version.h
+++ b/version.h
@@ -1,11 +1,11 @@
 #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_BRANCH_NAME "trunk"
 
 #define RUBY_RELEASE_YEAR 2011
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_DAY 8
 
 #include "ruby/version.h"