[Emacs-diffs] emacs-24 r116869: Fix bug#17097

[Dmitry Gutov]

------------------------------------------------------------
revno: 116869
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/17097
committer: Dmitry Gutov <address@hidden>
branch nick: emacs-24
timestamp: Thu 2014-03-27 08:53:13 +0200
message:
  Fix bug#17097
  
  * lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-function):
  Don't propertize `?' or `!' as symbol constituent when after
  colon.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/ruby-mode.el    
rubymode.el-20091113204419-o5vbwnq5f7feedwu-8804
  test/indent/ruby.rb            ruby.rb-20120424165921-h044139hbrd7snvw-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-03-27 01:01:36 +0000
+++ b/lisp/ChangeLog    2014-03-27 06:53:13 +0000
@@ -1,3 +1,9 @@
+2014-03-27  Dmitry Gutov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * frameset.el (frameset--restore-frame): Remove workaround for bug#14795

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2014-03-24 08:53:56 +0000
+++ b/lisp/progmodes/ruby-mode.el       2014-03-27 06:53:13 +0000
@@ -1812,6 +1812,7 @@
       ("[!?]"
        (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) '(?@ ?$))))

=== modified file 'test/indent/ruby.rb'
--- a/test/indent/ruby.rb       2014-03-21 04:26:39 +0000
+++ b/test/indent/ruby.rb       2014-03-27 06:53:13 +0000
@@ -148,6 +148,11 @@
   )
 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