summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorDmitry Gutov <dgutov@yandex.ru>2021-01-02 04:18:59 +0200
committerDmitry Gutov <dgutov@yandex.ru>2021-01-02 04:19:09 +0200
commit0f561ee55348ff451600cc6027db5940ee14606f (patch)
treeaafe2217f2911077adc0f1c22fa13e46fda386db /lisp
parent1c5208ba71156d225b54592e5e36788748f48ade (diff)
downloademacs-0f561ee55348ff451600cc6027db5940ee14606f.tar.gz
emacs-0f561ee55348ff451600cc6027db5940ee14606f.tar.bz2
emacs-0f561ee55348ff451600cc6027db5940ee14606f.zip
ruby-smie-rules: Avoid one case of infinite recursion
* lisp/progmodes/ruby-mode.el (ruby-smie-rules): Avoid one case of infinite recursion (bug#29107).
Diffstat (limited to 'lisp')
-rw-r--r--lisp/progmodes/ruby-mode.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 155a1609d3e..3effb6ed662 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -598,7 +598,7 @@ It is used when `ruby-encoding-magic-comment-style' is set to `custom'."
(`(:before . ,(or "(" "[" "{"))
(cond
((and (equal token "{")
- (not (smie-rule-prev-p "(" "{" "[" "," "=>" "=" "return" ";"))
+ (not (smie-rule-prev-p "(" "{" "[" "," "=>" "=" "return" ";" "do"))
(save-excursion
(forward-comment -1)
(not (eq (preceding-char) ?:))))