summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/ruby-mode.el4
2 files changed, 7 insertions, 2 deletions
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.
("\\(?:\\=\\|[^\\]\\)\\(?:\\\\\\\\\\)*\\(/\\)"