diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2015-03-20 06:04:36 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2015-03-20 06:04:36 +0200 |
| commit | a5d1f94fec6543cbf3c6e29f034c7ed53138c677 (patch) | |
| tree | 43b5dc16f9c8ae37c444146ec2168b4379308cde | |
| parent | 1a941d6c9eab9a35682408d6b85a1a98cfb6b01d (diff) | |
| download | emacs-a5d1f94fec6543cbf3c6e29f034c7ed53138c677.tar.gz | |
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)
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 763a8eecfbd..0b568929b22 100644 --- 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 3f560b9fee6..9c311cdbfb6 100644 --- 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. "\\|[?:] " |