procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backport: ruby-mode: Change faces used for self, true, false and nil

Browse source 
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 e991af9228)
This commit is contained in:
Dmitry Gutov 2015-03-20 06:04:54 +02:00
parent a5d1f94fec
commit f74843a7f1
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2015-03-20 Dmitry Gutov <dgutov@yandex.ru>
* 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 <nobu@ruby-lang.org>
* progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect

7
lisp/progmodes/ruby-mode.el
View file

@ -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))