From: Dmitry Gutov <dgutov@yandex.ru>
Date: Fri, 6 Dec 2013 14:24:10 +0000 (+0200)
Subject: * lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-function): Touch
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~539
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fa834a93da52976387fe71c0034d0c8d9437fe6b;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bd389d93d0..8e68eb40768 100644
--- 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 be12b1474c3..3d30cb015d6 100644
--- 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.
       ("\\(?:\\=\\|[^\\]\\)\\(?:\\\\\\\\\\)*\\(/\\)"