Commit 5cd9cda9 authored by Dmitry Gutov's avatar Dmitry Gutov
Browse files

* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Dedent `ensure'

keyword, too.

* test/indent/ruby.rb: Fix a syntax error, add a few failing examples.
parent da9ea6d9
2013-10-06 Dmitry Gutov <dgutov@yandex.ru>
* progmodes/ruby-mode.el (ruby-smie-rules): Dedent `ensure'
keyword, too.
2013-10-05 Dmitry Gutov <dgutov@yandex.ru>
* newcomment.el (comment-use-global-state): Change default value
......
......@@ -381,7 +381,7 @@ Also ignores spaces after parenthesis when 'space."
(looking-at comment-start-skip)))))
;; `(column . ,(smie-indent-virtual))
(smie-rule-parent)))
(`(:before . ,(or `"else" `"then" `"elsif" `"rescue")) 0)
(`(:before . ,(or `"else" `"then" `"elsif" `"rescue" `"ensure")) 0)
(`(:before . ,(or `"when"))
(if (not (smie-rule-sibling-p)) 0)) ;; ruby-indent-level
;; Hack attack: Since newlines are separators, don't try to align args that
......
2013-10-06 Dmitry Gutov <dgutov@yandex.ru>
* indent/ruby.rb: Fix a syntax error, add a few failing examples.
2013-10-05 Stefan Monnier <monnier@iro.umontreal.ca>
* indent/ruby.rb: Port a few cases from automated/ruby-mode-tests.el.
......
......@@ -37,7 +37,7 @@
2]
foo = { # ruby-deep-indent-disabled
a : b
a: b
}
foo = [ # ruby-deep-indent-disabled
......@@ -99,6 +99,27 @@ def test2 (arg)
do_something
end
begin
foo
ensure
bar
end
# Examples below fail with SMIE.
# Bug#15369
MSG = 'Separate every 3 digits in the integer portion of a number' \
'with underscores(_).'
# Next two fail similarly to the one above, so maybe remove 1 or 2
# after they're fixed:
a = foo(j, k) -
bar_tee
while a < b do # "do" is optional
foo
end
desc "foo foo" \
"bar bar"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment