* misc/ruby-style.el (ruby-style-{case,label}-indent): adjust for

  labels inside switch block.


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

1 files changed, 13 insertions, 9 deletions

diff --git a/misc/ruby-style.el b/misc/ruby-style.el
index 609c7509ba..6591581103 100644
--- a/misc/ruby-style.el
+++ b/misc/ruby-style.el
@@ -20,18 +20,22 @@
 
 (defun ruby-style-case-indent (x)
   (save-excursion
-    (goto-char (cdr x))
-    (if (looking-at "\\<case\\|default\\>") '*)))
+    (unless (progn (backward-up-list) (back-to-indentation)
+		   (> (point) (cdr x)))
+      (goto-char (cdr x))
+      (if (looking-at "\\<case\\|default\\>") '*))))
 
 (defun ruby-style-label-indent (x)
   (save-excursion
-    (goto-char (cdr x))
-    (condition-case ()
-	(progn
-	  (backward-up-list)
-	  (backward-sexp 2)
-	  (if (looking-at "\\<switch\\>") '/))
-      (error))))
+    (unless (progn (backward-up-list) (back-to-indentation)
+		   (> (point) (cdr x)))
+      (goto-char (cdr x))
+      (condition-case ()
+	  (progn
+	    (backward-up-list)
+	    (backward-sexp 2)
+	    (if (looking-at "\\<switch\\>") '/))
+	(error)))))
 
 (require 'cc-styles)
 (c-add-style