emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master dad0fc5 1/2: ruby-mode: Expect regexp after { or |


From: Dmitry Gutov
Subject: [Emacs-diffs] master dad0fc5 1/2: ruby-mode: Expect regexp after { or | too
Date: Sun, 08 Mar 2015 18:58:51 +0000

branch: master
commit dad0fc589c18dd95cf1ac77869a4530e2848c328
Author: Nobuyoshi Nakada <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    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.
---
 lisp/ChangeLog              |    6 ++++++
 lisp/progmodes/ruby-mode.el |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b277c7..60f5dfc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-08  Nobuyoshi Nakada  <address@hidden>
+
+       * 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  Stefan Monnier  <address@hidden>
 
        * battery.el (battery-echo-area-format): Simplify default.
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index d1e42ca..4307109 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.")
   (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.
      "\\|[?:] "



reply via email to

[Prev in Thread] Current Thread [Next in Thread]