aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDmitry Gutov2013-12-17 03:31:55 +0200
committerDmitry Gutov2013-12-17 03:31:55 +0200
commit5556c0cef106deb5a4614aabf96d223ada151f51 (patch)
tree9fed64046ebb8d1a664b351c39dba9bdef59292c /test
parent1c4b1e6107d17a184416b9bffd97222c06e5ff83 (diff)
downloademacs-5556c0cef106deb5a4614aabf96d223ada151f51.tar.gz
emacs-5556c0cef106deb5a4614aabf96d223ada151f51.zip
Fix bug#16116
* lisp/emacs-lisp/smie.el (smie-indent--rule): Extract `smie-indent--rule-1'. (smie-indent-close): Call `smie-indent--rule-1' with METHOD :close-all, to see which indentation method to use. (smie-rules-function): Document the method :close-all. * test/indent/ruby.rb: Update examples according to the change in `smie-indent-close'.
Diffstat (limited to 'test')
-rw-r--r--test/ChangeLog5
-rw-r--r--test/indent/ruby.rb9
2 files changed, 8 insertions, 6 deletions
diff --git a/test/ChangeLog b/test/ChangeLog
index ffa12498de4..374cae5a295 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,8 @@
12013-12-17 Dmitry Gutov <dgutov@yandex.ru>
2
3 * indent/ruby.rb: Update examples according to the change
4 in `smie-indent-close'.
5
12013-12-14 Dmitry Gutov <dgutov@yandex.ru> 62013-12-14 Dmitry Gutov <dgutov@yandex.ru>
2 7
3 * indent/ruby.rb: New examples. 8 * indent/ruby.rb: New examples.
diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index 7b85899577c..19bc0d03d47 100644
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -48,8 +48,7 @@ foo = { a: b,
48foo({ # bug#16118 48foo({ # bug#16118
49 a: b, 49 a: b,
50 c: d 50 c: d
51 } 51 })
52 ) # bug#16116
53 52
54bar = foo( 53bar = foo(
55 a, [ 54 a, [
@@ -57,8 +56,7 @@ bar = foo(
57 ], 56 ],
58 :qux => [ 57 :qux => [
59 3 58 3
60 ] 59 ])
61 )
62 60
63foo( 61foo(
64 [ 62 [
@@ -78,8 +76,7 @@ foo([{
78 b: 3 76 b: 3
79 }, 77 },
80 4 78 4
81 ] 79 ])
82 )
83 80
84foo = [ # ruby-deep-indent-disabled 81foo = [ # ruby-deep-indent-disabled
85 1 82 1