* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Move "Perl-ish

keywords" below "here-doc beginnings".

Fixes: debbugs:15270

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cd41db8708a320a61118272a57519b20f127fb12..6929d80653e3ab2657b060c34814b580d7c83b79 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-05  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * progmodes/ruby-mode.el (ruby-font-lock-keywords): Move "Perl-ish
+       keywords" below "here-doc beginnings" (Bug#15270).
+
 2013-09-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * subr.el (pop): Use `car-safe'.

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index acc7738ae5c817b7924fab3adca0a8b349bd596f..0f8682555893f16ea1f4c120c15d20ff335baee3 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1862,11 +1862,11 @@ See `font-lock-syntax-table'.")
              "using")
            'symbols))
          1 'font-lock-builtin-face)
-   ;; Perl-ish keywords
-   "\\_<\\(?:BEGIN\\|END\\)\\_>\\|^__END__$"
    ;; here-doc beginnings
    `(,ruby-here-doc-beg-re 0 (unless (ruby-singleton-class-p (match-beginning 0))
                                'font-lock-string-face))
+   ;; Perl-ish keywords
+   "\\_<\\(?:BEGIN\\|END\\)\\_>\\|^__END__$"
    ;; variables
    `(,(concat ruby-font-lock-keyword-beg-re
               "\\_<\\(nil\\|self\\|true\\|false\\)\\>")