diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2012-12-26 20:45:19 +0400 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2012-12-26 20:45:19 +0400 |
| commit | aaca1eb5196a19836325d36d05fb0363b06daa3f (patch) | |
| tree | ec9f84789c1fc0f4b1580896522010f614327ffa | |
| parent | 0a0fec277be36185ed83c5f773a68b5b1e7c01b9 (diff) | |
| download | emacs-aaca1eb5196a19836325d36d05fb0363b06daa3f.tar.gz | |
* lisp/progmodes/ruby-mode.el (ruby-indent-beg-re): Only allow "class",
"module" and "def" to have indentation before them. Regression
from 109911 (see the new test).
* test/automated/ruby-mode-tests.el
(ruby-indent-after-block-in-continued-expression): New test.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 5 | ||||
| -rw-r--r-- | test/ChangeLog | 5 | ||||
| -rw-r--r-- | test/automated/ruby-mode-tests.el | 13 |
4 files changed, 27 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6d5e77d190a..94e9720b86e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-12-26 Dmitry Gutov <dgutov@yandex.ru> + + * progmodes/ruby-mode.el (ruby-indent-beg-re): Only allow "class", + "module" and "def" to have indentation before them. Regression + from 109911 (see the new test). + 2012-12-24 Dmitry Gutov <dgutov@yandex.ru> * progmodes/ruby-mode.el: Bump the version to 1.2 (Bug#13200). diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 41a9aaed6f9..4d50eec6d5e 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -64,8 +64,9 @@ "Regexp to match keywords that nest without blocks.") (defconst ruby-indent-beg-re - (concat "^\\s *" (regexp-opt '("class" "module" "def" "if" "unless" "case" - "while" "until" "for" "begin")) "\\_>") + (concat "^\\(\\s *" (regexp-opt '("class" "module" "def")) "\\|" + (regexp-opt '("if" "unless" "case" "while" "until" "for" "begin")) + "\\)\\_>") "Regexp to match where the indentation gets deeper.") (defconst ruby-modifier-beg-keywords diff --git a/test/ChangeLog b/test/ChangeLog index 72b44747bac..7344d8dfb95 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,8 @@ +2012-12-26 Dmitry Gutov <dgutov@yandex.ru> + + * automated/ruby-mode-tests.el + (ruby-indent-after-block-in-continued-expression): New test. + 2012-10-14 Eli Zaretskii <eliz@gnu.org> * automated/compile-tests.el (compile-tests--test-regexps-data): diff --git a/test/automated/ruby-mode-tests.el b/test/automated/ruby-mode-tests.el index 8da0041e9a4..28c2a2a070d 100644 --- a/test/automated/ruby-mode-tests.el +++ b/test/automated/ruby-mode-tests.el @@ -202,6 +202,19 @@ VALUES-PLIST is a list with alternating index and value elements." | end |")) +(ert-deftest ruby-indent-after-block-in-continued-expression () + (ruby-should-indent-buffer + "var = + | begin + | val + | end + |statement" + "var = + |begin + |val + |end + |statement")) + (ert-deftest ruby-move-to-block-stops-at-indentation () (with-temp-buffer (insert "def f\nend") |