[Emacs-diffs] trunk r114146: * lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Move "Perl-ish

[Dmitry Gutov]

------------------------------------------------------------
revno: 114146
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15270
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Thu 2013-09-05 16:05:01 +0300
message:
  * lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Move "Perl-ish
  keywords" below "here-doc beginnings".
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/ruby-mode.el    
rubymode.el-20091113204419-o5vbwnq5f7feedwu-8804

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-05 12:33:37 +0000
+++ b/lisp/ChangeLog    2013-09-05 13:05:01 +0000
@@ -1,3 +1,8 @@
+2013-09-05  Dmitry Gutov  <address@hidden>
+
+       * progmodes/ruby-mode.el (ruby-font-lock-keywords): Move "Perl-ish
+       keywords" below "here-doc beginnings" (Bug#15270).
+
 2013-09-05  Stefan Monnier  <address@hidden>
 
        * subr.el (pop): Use `car-safe'.

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2013-09-03 00:29:10 +0000
+++ b/lisp/progmodes/ruby-mode.el       2013-09-05 13:05:01 +0000
@@ -1862,11 +1862,11 @@
              "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\\)\\>")