[Emacs-diffs] trunk r115396: * lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-function): Touch

[Dmitry Gutov]

------------------------------------------------------------
revno: 115396
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-12-06 16:24:10 +0200
message:
  * lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-function): Touch
  up the last change.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/ruby-mode.el    
rubymode.el-20091113204419-o5vbwnq5f7feedwu-8804

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-12-06 04:26:17 +0000
+++ b/lisp/ChangeLog    2013-12-06 14:24:10 +0000
@@ -1,3 +1,8 @@
+2013-12-06  Dmitry Gutov  <address@hidden>
+
+       * progmodes/ruby-mode.el (ruby-syntax-propertize-function): Touch
+       up the last change.
+
 2013-12-06  Leo Liu  <address@hidden>
 
        * progmodes/octave.el (inferior-octave-prompt): Use shy groups.

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2013-12-06 04:22:08 +0000
+++ b/lisp/progmodes/ruby-mode.el       2013-12-06 14:24:10 +0000
@@ -1652,8 +1652,8 @@
        (0 (unless (save-excursion
                     (or (nth 8 (syntax-ppss (match-beginning 0)))
                         (let (parse-sexp-lookup-properties)
-                          (or (zerop (skip-syntax-backward "w_"))
-                              (memq (preceding-char) '(?@ ?$))))))
+                          (zerop (skip-syntax-backward "w_")))
+                        (memq (preceding-char) '(?@ ?$))))
             (string-to-syntax "_"))))
       ;; Regular expressions.  Start with matching unescaped slash.
       ("\\(?:\\=\\|[^\\]\\)\\(?:\\\\\\\\\\)*\\(/\\)"