* misc/ruby-style.el (ruby-style-label-indent): for yacc rules.

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

3 files changed, 18 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 86e8110779..ae7969bb2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu May 17 17:03:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* misc/ruby-style.el (ruby-style-label-indent): for yacc rules.
+
 Tue May 15 14:54:07 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (init_stdhandle): stderr should be without buffering,
diff --git a/misc/ruby-style.el b/misc/ruby-style.el
index 1768789470..e0ed41fbc9 100644
--- a/misc/ruby-style.el
+++ b/misc/ruby-style.el
@@ -4,18 +4,25 @@
 (defun ruby-style-case-indent (x)
   (save-excursion
     (goto-char (cdr x))
-    (if (looking-at "\\<case\\|default\\>")
-	(- c-basic-offset
-	   (% (current-column) c-basic-offset)))))
+    (if (looking-at "\\<case\\|default\\>") '*)))
+
+(defun ruby-style-label-indent (x)
+  (save-excursion
+    (goto-char (cdr x))
+    (backward-up-list)
+    (backward-sexp 2)
+    (if (looking-at "\\<switch\\>") '/)))
 
 (require 'cc-styles)
 (c-add-style
  "ruby"
  '("bsd"
    (c-basic-offset . 4)
+   (tab-width . 8)
+   (indent-tabs-mode . t)
    (c-offsets-alist
     (case-label . *)
-    (label . *)
+    (label . (ruby-style-label-indent *))
     (statement-case-intro . *)
     (statement-case-open . *)
     (statement-block-intro . (ruby-style-case-indent +))
diff --git a/version.h b/version.h
index b1f82d5989..b7a7a96129 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-05-15"
+#define RUBY_RELEASE_DATE "2007-05-17"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20070515
+#define RUBY_RELEASE_CODE 20070517
 #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 5
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 17
 
 RUBY_EXTERN const char ruby_version[];
 RUBY_EXTERN const char ruby_release_date[];