[Emacs-diffs] emacs-24 f74843a 2/3: Backport: ruby-mode: Change faces used for self, true, false and nil

[Dmitry Gutov]

branch: emacs-24
commit f74843a7f1ebc767cc67cda8981247c7e46404fd
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Backport: ruby-mode: Change faces used for self, true, false and nil
    
    Fixes: debbugs:17733
    
    * lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Use
    `font-lock-constant-face' for nil, true and false.  Highlight
    `self' as a keyword.
    
    (cherry picked from commit e991af9228af77356df1e4ce7e824d5140a3bf8a)
---
 lisp/ChangeLog              |    6 ++++++
 lisp/progmodes/ruby-mode.el |    7 ++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0b56892..eaf7c46 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-20  Dmitry Gutov  <address@hidden>
+
+       * progmodes/ruby-mode.el (ruby-font-lock-keywords): Use
+       `font-lock-constant-face' for nil, true and false.  Highlight
+       `self' as a keyword.  (Bug#17733)
+
 2015-03-20  Nobuyoshi Nakada  <address@hidden>
 
        * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 9c311cd..e15105e 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -2013,8 +2013,9 @@ See `font-lock-syntax-table'.")
           "rescue"
           "retry"
           "return"
-          "then"
+          "self"
           "super"
+          "then"
           "unless"
           "undef"
           "until"
@@ -2109,8 +2110,8 @@ See `font-lock-syntax-table'.")
     "\\_<\\(?:BEGIN\\|END\\)\\_>\\|^__END__$"
     ;; Variables.
     (,(concat ruby-font-lock-keyword-beg-re
-              "\\_<\\(nil\\|self\\|true\\|false\\)\\_>")
-     1 font-lock-variable-name-face)
+              "\\_<\\(nil\\|true\\|false\\)\\_>")
+     1 font-lock-constant-face)
     ;; Keywords that evaluate to certain values.
     ("\\_<__\\(?:LINE\\|ENCODING\\|FILE\\)__\\_>"
      (0 font-lock-builtin-face))