* lisp/progmodes/ruby-mode.el (ruby-smie-grammar): Lower priority of

"." compared to "do".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index be01a0cdc2987027f0635c71e488849b9a36fd82..bbd86b51bc67b700b1316fe98a7dca9e7b00ed23 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-07  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-smie-grammar): Lower priority of
+       "." compared to "do".
+
 2013-11-06  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (setwins_almost, setwins_for_subdirs):

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 253a6006052bfc5b5b8e4f095dad5295ba22c86f..b5020344872c0dd03b3570b719f5a1719b1f6bbb 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -280,7 +280,7 @@ explicitly declared in magic comment."
        (inst (exp) (inst "iuwu-mod" exp))
        (exp  (exp1) (exp "," exp) (exp "=" exp)
              (id " @ " exp)
-             (exp "." exp))
+             (exp "." id))
        (exp1 (exp2) (exp2 "?" exp1 ":" exp1))
        (exp2 ("def" insts "end")
              ("begin" insts-rescue-insts "end")

diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index 5e3db5afb71adc08d246922e1a9e429ae9507a1f..3d881edcba9ec3c61fa1559625f73232c7e70edc 100644 (file)
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -238,12 +238,10 @@ foo :bar do
   qux
 end
 
-# Examples below still fail with `ruby-use-smie' on:
-
 foo = [1, 2, 3].map do |i|
   i + 1
 end
 
-bar.foo do # "." is parent to "do"; it shouldn't be.
+bar.foo do
   bar
 end