* lisp/progmodes/ruby-mode.el (ruby-smie--forward-token)

(ruby-smie--backward-token): Tokenize heredocs as semicolons.

* test/automated/ruby-mode-tests.el: Remove outdated comment.

* test/indent/ruby.rb: Add a statement on the line after heredoc.

3 files changed, 7 insertions, 2 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 1439ee12bb4..3f9f4e8810a 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-04  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * indent/ruby.rb: Add a statement on the line after heredoc.
+
+        * automated/ruby-mode-tests.el: Remove outdated comment.
+
 2013-11-04  Glenn Morris  <rgm@gnu.org>
 
         * automated/Makefile.in (abs_srcdir): Remove.
diff --git a/test/automated/ruby-mode-tests.el b/test/automated/ruby-mode-tests.el
index dc86b4a2914..d5d262590b6 100644
--- a/test/automated/ruby-mode-tests.el
+++ b/test/automated/ruby-mode-tests.el
@@ -585,8 +585,6 @@ VALUES-PLIST is a list with alternating index and value elements."
     (end-of-defun)
     (should (= 5 (line-number-at-pos)))))
 
-;; Tests below fail when using SMIE.
-
 (defvar ruby-sexp-test-example
   (ruby-test-string
    "class C
diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index 65c33bb3ecf..4bf65ffcf27 100644
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -3,6 +3,7 @@ if something_wrong?             # ruby-move-to-block-skips-heredoc
   boo hoo
   end
   eowarn
+  foo
 end
 
 # Percent literals.