aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2013-11-15 20:09:10 +0200
committerDmitry Gutov2013-11-15 20:09:10 +0200
commit43cebc237c147aecf53b6d2dc64f5df3e92b4d98 (patch)
tree6fb538f710fbaff89954724653f18f9600532d11
parent2fcc742fc5c1a8de794d78a32c0c0fbf4629ca92 (diff)
downloademacs-43cebc237c147aecf53b6d2dc64f5df3e92b4d98.tar.gz
emacs-43cebc237c147aecf53b6d2dc64f5df3e92b4d98.zip
* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): End regexp for
nil/self/true/false with "end of symbol".
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/ruby-mode.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a8e807adc1c..aabdbd6b0fc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-11-15 Dmitry Gutov <dgutov@yandex.ru>
2
3 * progmodes/ruby-mode.el (ruby-font-lock-keywords): End regexp for
4 nil/self/true/false with "end of symbol".
5
12013-11-15 Bozhidar Batsov <bozhidar@batsov.com> 62013-11-15 Bozhidar Batsov <bozhidar@batsov.com>
2 7
3 * subr.el (version-regexp-alist): Fix a typo. 8 * subr.el (version-regexp-alist): Fix a typo.
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index e5a2de931d2..ab9fdce6af8 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1925,7 +1925,7 @@ See `font-lock-syntax-table'.")
1925 "\\_<\\(?:BEGIN\\|END\\)\\_>\\|^__END__$" 1925 "\\_<\\(?:BEGIN\\|END\\)\\_>\\|^__END__$"
1926 ;; Variables. 1926 ;; Variables.
1927 (,(concat ruby-font-lock-keyword-beg-re 1927 (,(concat ruby-font-lock-keyword-beg-re
1928 "\\_<\\(nil\\|self\\|true\\|false\\)\\>") 1928 "\\_<\\(nil\\|self\\|true\\|false\\)\\_>")
1929 1 font-lock-variable-name-face) 1929 1 font-lock-variable-name-face)
1930 ;; Keywords that evaluate to certain values. 1930 ;; Keywords that evaluate to certain values.
1931 ("\\_<__\\(?:LINE\\|ENCODING\\|FILE\\)__\\_>" 1931 ("\\_<__\\(?:LINE\\|ENCODING\\|FILE\\)__\\_>"