summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorDmitry Gutov <dgutov@yandex.ru>2014-03-27 08:53:13 +0200
committerDmitry Gutov <dgutov@yandex.ru>2014-03-27 08:53:13 +0200
commit42ebc34ea8f93efe5b23c0124691207f32055666 (patch)
tree5e4af15b8b2b09e19b815fbac41e39adcbdc4bb0 /lisp
parent857ba6ec4622ba658788b8cd5805e8e9e8a5db16 (diff)
downloademacs-42ebc34ea8f93efe5b23c0124691207f32055666.tar.gz
emacs-42ebc34ea8f93efe5b23c0124691207f32055666.tar.bz2
emacs-42ebc34ea8f93efe5b23c0124691207f32055666.zip
Fix bug#17097
* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-function): Don't propertize `?' or `!' as symbol constituent when after colon.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/ruby-mode.el1
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cb256740a03..ff76cadf945 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-03-27 Dmitry Gutov <dgutov@yandex.ru>
+
+ * 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 <lekktu@gmail.com>
* frameset.el (frameset--restore-frame): Remove workaround for bug#14795
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 2b8f2fa6868..7219221d4e7 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1812,6 +1812,7 @@ It will be properly highlighted even when the call omits parens.")
("[!?]"
(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) '(?@ ?$))))