[Emacs-diffs] /srv/bzr/emacs/trunk r112801: * lisp/progmodes/ruby-mode.el (ruby-syntax-expansion-allowed-p):

[Dmitry Gutov]

------------------------------------------------------------
revno: 112801
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Fri 2013-05-31 20:55:03 +0400
message:
  * lisp/progmodes/ruby-mode.el (ruby-syntax-expansion-allowed-p):
  Highlight expansions inside regexp literals.
modified:
  lisp/ChangeLog
  lisp/progmodes/ruby-mode.el
  test/automated/ruby-mode-tests.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-05-31 07:34:56 +0000
+++ b/lisp/ChangeLog    2013-05-31 16:55:03 +0000
@@ -1,3 +1,8 @@
+2013-05-31  Dmitry Gutov  <address@hidden>
+
+       * progmodes/ruby-mode.el (ruby-syntax-expansion-allowed-p):
+       Highlight expansions inside regexp literals.
+
 2013-05-31  Glenn Morris  <address@hidden>
 
        * obsolete/sym-comp.el (symbol-complete):

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2013-05-31 06:04:33 +0000
+++ b/lisp/progmodes/ruby-mode.el       2013-05-31 16:55:03 +0000
@@ -1513,7 +1513,7 @@
         "Return non-nil if expression expansion is allowed."
         (let ((term (nth 3 parse-state)))
           (cond
-           ((memq term '(?\" ?` ?\n)))
+           ((memq term '(?\" ?` ?\n ?/)))
            ((eq term t)
             (save-match-data
               (save-excursion

=== modified file 'test/automated/ruby-mode-tests.el'
--- a/test/automated/ruby-mode-tests.el 2013-05-31 06:04:33 +0000
+++ b/test/automated/ruby-mode-tests.el 2013-05-31 16:55:03 +0000
@@ -112,6 +112,9 @@
 (ert-deftest ruby-regexp-starts-after-string ()
   (ruby-assert-state "'(/', /\d+/" 3 ?/ 8))
 
+(ert-deftest ruby-regexp-interpolation-is-highlighted ()
+  (ruby-assert-face "/#{foobs}/" 4 font-lock-variable-name-face))
+
 (ert-deftest ruby-regexp-skips-over-interpolation ()
   (ruby-assert-state "/#{foobs.join('/')}/" 3 nil))