From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sun, 23 Feb 2014 05:53:53 +0000 (+0200)
Subject: * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Don't indent specially
X-Git-Tag: emacs-24.3.90~173^2^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=62f9502226a8b910df0abe62b9f9fc7104647c62;p=emacs.git

* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Don't indent specially
after `=>'.

Fixes: debbugs:16811
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2dad756b618..bcb09e177c6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-23  Dmitry Gutov  <dgutov@yandex.ru>
+
+	* progmodes/ruby-mode.el (ruby-smie-rules): Don't indent specially
+	after `=>' (bug#16811).
+
 2014-02-23  Juanma Barranquero  <lekktu@gmail.com>
 
 	* elec-pair.el (electric-pair-text-syntax-table)
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index e2175fcc80b..709bc67451d 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -653,7 +653,6 @@ It is used when `ruby-encoding-magic-comment-style' is set to `custom'."
      (if (smie-rule-sibling-p)
          (and ruby-align-chained-calls 0)
        ruby-indent-level))
-    (`(:after . "=>") ruby-indent-level)
     (`(:before . ,(or `"else" `"then" `"elsif" `"rescue" `"ensure"))
      (smie-rule-parent))
     (`(:before . "when")
diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index cf6bcba8c39..5fd59bfb186 100644
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -361,4 +361,10 @@ foo(bar:
       tee)
 
 foo(:bar =>
-      tee)
+    tee)
+
+{'a' => {
+   'b' => 'c',
+   'd' => %w(e f)
+ }
+}