diff options
| author | Nobuyoshi Nakada | 2015-03-08 20:57:29 +0200 |
|---|---|---|
| committer | Dmitry Gutov | 2015-03-08 20:57:29 +0200 |
| commit | dad0fc589c18dd95cf1ac77869a4530e2848c328 (patch) | |
| tree | 9224bcb805e7cec262920d50be2ae9fb3255ca8b | |
| parent | d03ec1cf1662e3dc911439f09e64e8a5a3754832 (diff) | |
| download | emacs-dad0fc589c18dd95cf1ac77869a4530e2848c328.tar.gz emacs-dad0fc589c18dd95cf1ac77869a4530e2848c328.zip | |
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.
| -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 0b277c7c518..60f5dfcdb7c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2015-03-08 Nobuyoshi Nakada <nobu@ruby-lang.org> | ||
| 2 | |||
| 3 | * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect | ||
| 4 | beginning of regexp also after open brace or vertical bar. | ||
| 5 | (Bug#20026) | ||
| 6 | |||
| 1 | 2015-03-07 Stefan Monnier <monnier@iro.umontreal.ca> | 7 | 2015-03-07 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 8 | ||
| 3 | * battery.el (battery-echo-area-format): Simplify default. | 9 | * battery.el (battery-echo-area-format): Simplify default. |
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index d1e42ca3443..4307109f654 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el | |||
| @@ -1817,7 +1817,7 @@ It will be properly highlighted even when the call omits parens.") | |||
| 1817 | (defvar ruby-syntax-before-regexp-re | 1817 | (defvar ruby-syntax-before-regexp-re |
| 1818 | (concat | 1818 | (concat |
| 1819 | ;; Special tokens that can't be followed by a division operator. | 1819 | ;; Special tokens that can't be followed by a division operator. |
| 1820 | "\\(^\\|[[=(,~;<>]" | 1820 | "\\(^\\|[[{|=(,~;<>]" |
| 1821 | ;; Distinguish ternary operator tokens. | 1821 | ;; Distinguish ternary operator tokens. |
| 1822 | ;; FIXME: They don't really have to be separated with spaces. | 1822 | ;; FIXME: They don't really have to be separated with spaces. |
| 1823 | "\\|[?:] " | 1823 | "\\|[?:] " |