[前][次][番号順一覧][スレッド一覧]

ruby-changes:18792

From: nobu <ko1@a...>
Date: Tue, 8 Feb 2011 00:55:23 +0900 (JST)
Subject: [ruby-changes:18792] Ruby:r30818 (trunk): * misc/ruby-mode.el (ruby-expr-beg, ruby-parse-partial): keyword

nobu	2011-02-08 00:53:15 +0900 (Tue, 08 Feb 2011)

  New Revision: 30818

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30818

  Log:
    * misc/ruby-mode.el (ruby-expr-beg, ruby-parse-partial): keyword
      followed by colon is label.

  Modified files:
    trunk/ChangeLog
    trunk/misc/ruby-mode.el
    trunk/version.h

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30817)
+++ ChangeLog	(revision 30818)
@@ -1,3 +1,8 @@
+Tue Feb  8 00:53:14 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@g...>
 
 	* lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of
Index: misc/ruby-mode.el
===================================================================
--- misc/ruby-mode.el	(revision 30817)
+++ misc/ruby-mode.el	(revision 30818)
@@ -467,7 +467,7 @@
                                         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 @@
          (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))
Index: version.h
===================================================================
--- version.h	(revision 30817)
+++ version.h	(revision 30818)
@@ -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"
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]