diff options
| author | Stefan Monnier | 2013-10-23 13:18:11 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2013-10-23 13:18:11 -0400 |
| commit | bc4aaa31e2538c6992f9408f0190460eef79b655 (patch) | |
| tree | 22a3ff43d12301569f11a591ac29f63c7bd2b53f | |
| parent | f493ff19e981bad0ab8146c41fa65945de977088 (diff) | |
| download | emacs-bc4aaa31e2538c6992f9408f0190460eef79b655.tar.gz emacs-bc4aaa31e2538c6992f9408f0190460eef79b655.zip | |
* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Don't return 0 for
:before ";".
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dd8619768cb..63156bb18a1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-10-23 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * progmodes/ruby-mode.el (ruby-smie-rules): Don't return 0 for | ||
| 4 | :before ";". | ||
| 5 | |||
| 1 | 2013-10-23 Jed Brown <jed@59A2.org> (tiny change) | 6 | 2013-10-23 Jed Brown <jed@59A2.org> (tiny change) |
| 2 | 7 | ||
| 3 | * progmodes/compile.el (compilation-directory-matcher) | 8 | * progmodes/compile.el (compilation-directory-matcher) |
| @@ -20,8 +25,8 @@ | |||
| 20 | 25 | ||
| 21 | 2013-10-23 Dmitry Gutov <dgutov@yandex.ru> | 26 | 2013-10-23 Dmitry Gutov <dgutov@yandex.ru> |
| 22 | 27 | ||
| 23 | * progmodes/ruby-mode.el (ruby-smie--at-dot-call): Use | 28 | * progmodes/ruby-mode.el (ruby-smie--at-dot-call): |
| 24 | `following-char'. | 29 | Use `following-char'. |
| 25 | 30 | ||
| 26 | 2013-10-22 Stefan Monnier <monnier@iro.umontreal.ca> | 31 | 2013-10-22 Stefan Monnier <monnier@iro.umontreal.ca> |
| 27 | 32 | ||
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index a9c4cf95700..7b9dcd44b24 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el | |||
| @@ -453,7 +453,7 @@ explicitly declared in magic comment." | |||
| 453 | (smie-rule-parent ruby-indent-level)) | 453 | (smie-rule-parent ruby-indent-level)) |
| 454 | ;; For (invalid) code between switch and case. | 454 | ;; For (invalid) code between switch and case. |
| 455 | ;; (if (smie-parent-p "switch") 4) | 455 | ;; (if (smie-parent-p "switch") 4) |
| 456 | (t 0))) | 456 | )) |
| 457 | (`(:before . ,(or `"(" `"[" `"{")) | 457 | (`(:before . ,(or `"(" `"[" `"{")) |
| 458 | (cond | 458 | (cond |
| 459 | ((and (equal token "{") | 459 | ((and (equal token "{") |