Backport: ruby-mode: Expect regexp after { or | too

Fixes: debbugs:20026
* progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect
beginning of regexp also after open brace or vertical bar.

(cherry picked from commit dad0fc589c18dd95cf1ac77869a4530e2848c328)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 763a8eecfbd6117013b598276341616df29e5a7f..0b568929b227a6d0eb1ea699483830b7f95b914d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-20  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+       * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect
+       beginning of regexp also after open brace or vertical bar.
+       (Bug#20026)
+
 2015-03-07  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-ssh-controlmaster-options): Make it a

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 3f560b9fee6e62ce50062852d0c834b487fa2699..9c311cdbfb60f8adb5a300fc59d1255bd15c5cf1 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1777,7 +1777,7 @@ 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.
      "\\|[?:] "