From d1bbba4fa5de77c3bdfb01901b697ead748a4ba6 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Wed, 19 Jun 2013 02:17:56 +0400 Subject: * lisp/progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Distinguish ternary operator tokens from slash symbol and slash char literal. --- lisp/progmodes/ruby-mode.el | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lisp/progmodes/ruby-mode.el') diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index fa4efe49b7b..8a1548bc940 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -1368,7 +1368,10 @@ It will be properly highlighted even when the call omits parens.") (defvar ruby-syntax-before-regexp-re (concat ;; Special tokens that can't be followed by a division operator. - "\\(^\\|[[=(,~?:;<>]" + "\\(^\\|[[=(,~;<>]" + ;; Distinguish ternary operator tokens. + ;; FIXME: They don't really have to be separated with spaces. + "\\|[?:] " ;; Control flow keywords and operators following bol or whitespace. "\\|\\(?:^\\|\\s \\)" (regexp-opt '("if" "elsif" "unless" "while" "until" "when" "and" -- cgit v1.2.3