Fix bug#17097

* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-function):
Don't propertize `?' or `!' as symbol constituent when after
colon.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb256740a03dbc7c68d517699460e78cb8378215..ff76cadf9458fa7e028a47f7caf2b2e13c73a69b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-27  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-syntax-propertize-function):
+       Don't propertize `?' or `!' as symbol constituent when after
+       colon.  (Bug#17097)
+
 2014-03-27  Juanma Barranquero  <lekktu@gmail.com>
 
        * frameset.el (frameset--restore-frame): Remove workaround for bug#14795

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 2b8f2fa68682ddd67c1fe228079c0ea0928e2f90..7219221d4e7465b2d2b383a9a5ad782c4670b54e 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1812,6 +1812,7 @@ It will be properly highlighted even when the call omits parens.")
       ("[!?]"
        (0 (unless (save-excursion
                     (or (nth 8 (syntax-ppss (match-beginning 0)))
+                        (eq (char-before) ?:)
                         (let (parse-sexp-lookup-properties)
                           (zerop (skip-syntax-backward "w_")))
                         (memq (preceding-char) '(?@ ?$))))

diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index 9948243314562e206a774b72f38c0676a6b03fa6..fb341ee7ba6096bae4fdca70fae655308f9613fa 100644 (file)
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -148,6 +148,11 @@ if something == :==
   )
 end
 
+# Bug#17097
+if x == :!=
+  something
+end
+
 # Example from http://www.ruby-doc.org/docs/ProgrammingRuby/html/language.html
 d = 4 + 5 +      # no '\' needed
     6 + 7