* lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-function):

Copy change made to ruby-font-lock-syntactic-keywords.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f3d3d17be9593ce2c94c44f79a244c400bb4b06..3f5bbd33f66067cb5099c68501793e69ab4b608f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-01-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * progmodes/ruby-mode.el (ruby-syntax-propertize-function):
+       Copy change made to ruby-font-lock-syntactic-keywords.
+
        * htmlfontify.el: Make it obey the font-lock-face text property.
        Miscellaneous cleanup such as:
        - Don't hide expressions after a closing paren.

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 1c71fc68bfe95ad60767395100620cb56d38dfbb..9d40b4d8fd7b16bb105c399ef6ceed7c59e63659 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1129,7 +1129,7 @@ See `add-log-current-defun-function'."
                         (nth 3 (syntax-ppss (match-beginning 0))))
                 (string-to-syntax "\\"))))
           ;; regexps
-          ("\\(^\\|[=(,~?:;<>]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
+          ("\\(^\\|[[=(,~?:;<>]\\|\\(^\\|\\s \\)\\(if\\|elsif\\|unless\\|while\\|until\\|when\\|and\\|or\\|&&\\|||\\)\\|g?sub!?\\|scan\\|split!?\\)\\s *\\(/\\)[^/\n\\\\]*\\(\\\\.[^/\n\\\\]*\\)*\\(/\\)"
            (4 "\"/")
            (6 "\"/"))
           ("^=en\\(d\\)\\_>" (1 "!"))