[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116534: * lisp/progmodes/ruby-mode.el (ruby-smie-ru
From: |
Dmitry Gutov |
Subject: |
[Emacs-diffs] trunk r116534: * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Don't indent specially |
Date: |
Sun, 23 Feb 2014 05:54:03 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116534
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16811
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Sun 2014-02-23 07:53:53 +0200
message:
* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Don't indent specially
after `=>'.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/progmodes/ruby-mode.el
rubymode.el-20091113204419-o5vbwnq5f7feedwu-8804
test/indent/ruby.rb ruby.rb-20120424165921-h044139hbrd7snvw-1
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-02-23 00:19:11 +0000
+++ b/lisp/ChangeLog 2014-02-23 05:53:53 +0000
@@ -1,3 +1,8 @@
+2014-02-23 Dmitry Gutov <address@hidden>
+
+ * progmodes/ruby-mode.el (ruby-smie-rules): Don't indent specially
+ after `=>' (bug#16811).
+
2014-02-23 Juanma Barranquero <address@hidden>
* elec-pair.el (electric-pair-text-syntax-table)
=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el 2014-02-21 15:39:17 +0000
+++ b/lisp/progmodes/ruby-mode.el 2014-02-23 05:53:53 +0000
@@ -653,7 +653,6 @@
(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")
=== modified file 'test/indent/ruby.rb'
--- a/test/indent/ruby.rb 2014-02-01 14:54:58 +0000
+++ b/test/indent/ruby.rb 2014-02-23 05:53:53 +0000
@@ -361,4 +361,10 @@
tee)
foo(:bar =>
- tee)
+ tee)
+
+{'a' => {
+ 'b' => 'c',
+ 'd' => %w(e f)
+ }
+}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116534: * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Don't indent specially,
Dmitry Gutov <=