Merge from emacs-24; up to 2014-03-21T08:51:02Z!eliz@gnu.org

1 files changed, 17 insertions, 0 deletions

diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index 2ca0e482797..99482433145 100644
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -379,3 +379,20 @@ foo(:bar =>
    'd' => %w(e f)
  }
 }
+
+# Bug#17050
+
+return render json: {
+                errors: { base: [message] },
+                copying: copying
+              },
+              status: 400
+
+top test(
+      some,
+      top,
+      test)
+
+foo bar, {
+      tee: qux
+    }