From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Thu, 27 Jan 2011 17:07:48 +0000 (-0500)
Subject: * lisp/progmodes/ruby-mode.el (ruby-syntax-propertize-function):
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~113
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=89fdaac7aa8a2959cc53f0be61fe6c38c8c1d821;p=emacs.git

* 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 1f3d3d17be9..3f5bbd33f66 100644
--- 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 1c71fc68bfe..9d40b4d8fd7 100644
--- 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 "!"))