* ruby-mode.el: Handle general delimited literals.

Fixes: debbugs:6286

diff --cc lisp/ChangeLog
index 269d72e37547539d05afc2f9d117b57b5668b2d4,6ae22e6948f0e4cb763b719a904b1205741cf446..0eda6b289362c609a59755f656c958721cebeee2
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,11 -1,25 +1,33 @@@
+ 2012-04-24  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+       * progmodes/ruby-mode.el: Simplify last change, and cleanup code.
+       (ruby-syntax-propertize-regexp): Remove.
+       (ruby-syntax-propertize-function): Split regexp into chunks.
+       Match following code directly.
+ 
+ 2012-04-24  Dmitry Gutov  <dgutov@yandex.ru>
+ 
+       * progmodes/ruby-mode.el: Handle Cucumber defs (bug#6286).
+       (ruby-syntax-propertize-regexp): New function.
+       (ruby-syntax-propertize-function): Use it to handle regexp not preceded
+       by a special keyword.
+ 
+       * progmodes/ruby-mode.el: Handle general delimited literals (bug#6286).
+       (ruby-syntax-general-delimiters-goto-beg)
+       (ruby-syntax-propertize-general-delimiters): New functions.
+       (ruby-syntax-propertize-function): Use them to handle GDL.
+       (ruby-font-lock-keywords): Move old handling of GDL...
+       (ruby-font-lock-syntactic-keywords): .. to here.
+       (ruby-calculate-indent): Adjust indentation for GDL.
+ 
 +2012-04-24  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * notifications.el (notifications-interface)
 +      (notifications-notify-method, notifications-notify)
 +      (notifications-close-notification-method): Fix docstring.
 +      (notifications-get-capabilities-method): New defconst.
 +      (notifications-get-capabilities): New defun.
 +
  2012-04-24  Leo Liu  <sdl.web@gmail.com>
  
        * progmodes/python.el: Move hideshow setup to the end.