* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-function): Touch

up the last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bd389d93d02da8578d72830c2cacf9af9cfa2ee..8e68eb407689376c317f6d8bf713a22fc3fbcb67 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-06  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-syntax-propertize-function): Touch
+       up the last change.
+
 2013-12-06  Leo Liu  <sdl.web@gmail.com>
 
        * progmodes/octave.el (inferior-octave-prompt): Use shy groups.

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index be12b1474c3612e1ec66a7b399fe6e973e1c5f0d..3d30cb015d6ccf2ea96c176bceb955178a281e42 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1652,8 +1652,8 @@ It will be properly highlighted even when the call omits parens.")
        (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.
       ("\\(?:\\=\\|[^\\]\\)\\(?:\\\\\\\\\\)*\\(/\\)"