* lisp/progmodes/ruby-mode.el (ruby-smie--implicit-semi-p): Return t

after the end of a percent literal.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6e2631887ad8fe2fc92e28c3e1052ff106eb756e..ae0dcc3de32eef275840f44f67398a7400b1c7d0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-09  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-smie--implicit-semi-p): Return t
+       after the end of a percent literal.
+
 2013-12-09  Cameron Desautels  <camdez@gmail.com>  (tiny change)
 
        * progmodes/ruby-mode.el (ruby-forward-string): Document.  Handle

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index fe36e7254262dff2bd4f8db14eaf5aa785770dd7..af7a4d8c321395e1a773c74115ad9e49a09a40c0 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -362,8 +362,8 @@ It is used when `ruby-encoding-magic-comment-style' is set to `custom'."
              (and (memq (char-before)
                         '(?\; ?- ?+ ?* ?/ ?: ?. ?, ?\[ ?\( ?\{ ?\\ ?& ?> ?< ?%
                           ?~ ?^))
-                  ;; Make sure it's not the end of a regexp.
-                  (not (eq (car (syntax-after (1- (point)))) 7)))
+                  ;; Not the end of a regexp or a percent literal.
+                  (not (memq (car (syntax-after (1- (point)))) '(7 15))))
              (and (eq (char-before) ?\?)
                   (equal (save-excursion (ruby-smie--backward-token)) "?"))
              (and (eq (char-before) ?=)

diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index a3ab73bcfb5973a994d16f0ca967f5771a96cb66..3c4d68a97bfa47e849e56b9465b323c977117a91 100644 (file)
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -299,3 +299,6 @@ def qux
     tee
   end
 end
+
+%^abc^
+ddd