From: Dmitry Gutov Date: Thu, 5 Sep 2013 13:05:01 +0000 (+0300) Subject: * lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Move "Perl-ish X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1664^2~22 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1f896cb7ede7d658797737574b2d6b00d128a592;p=emacs.git * 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 cd41db8708a..6929d80653e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-09-05 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-font-lock-keywords): Move "Perl-ish + keywords" below "here-doc beginnings" (Bug#15270). + 2013-09-05 Stefan Monnier * subr.el (pop): Use `car-safe'. diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index acc7738ae5c..0f868255589 100644 --- 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\\)\\>")