aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2013-07-13 23:10:19 +0400
committerDmitry Gutov2013-07-13 23:10:19 +0400
commit2ce3c56586f4061727ace4daed4582d2aa6f8e98 (patch)
tree1b32336e7b9eb0deb7e471b29f2511448f5d81e4
parent2cdb769811731975a1ad65fd75d642f5b92b158a (diff)
downloademacs-2ce3c56586f4061727ace4daed4582d2aa6f8e98.tar.gz
emacs-2ce3c56586f4061727ace4daed4582d2aa6f8e98.zip
* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
conversion methods on Kernel.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/ruby-mode.el5
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 91373ef8a6b..5451abc2119 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-07-13 Dmitry Gutov <dgutov@yandex.ru>
2
3 * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
4 conversion methods on Kernel.
5
12013-07-13 Alan Mackenzie <acm@muc.de> 62013-07-13 Alan Mackenzie <acm@muc.de>
2 7
3 * progmodes/cc-engine.el (c-forward-decl-or-cast-1): Label CASE 13 8 * progmodes/cc-engine.el (c-forward-decl-or-cast-1): Label CASE 13
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 06dffd80d88..0b83921504b 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1851,6 +1851,11 @@ See `font-lock-syntax-table'.")
1851 '("\\(?:\\_<\\|::\\)\\([A-Z]+\\(\\w\\|_\\)*\\)" 1851 '("\\(?:\\_<\\|::\\)\\([A-Z]+\\(\\w\\|_\\)*\\)"
1852 1 (unless (eq ?\( (char-after)) font-lock-type-face)) 1852 1 (unless (eq ?\( (char-after)) font-lock-type-face))
1853 '("\\(^\\s *\\|[\[\{\(,]\\s *\\|\\sw\\s +\\)\\(\\(\\sw\\|_\\)+\\):[^:]" 2 font-lock-constant-face) 1853 '("\\(^\\s *\\|[\[\{\(,]\\s *\\|\\sw\\s +\\)\\(\\(\\sw\\|_\\)+\\):[^:]" 2 font-lock-constant-face)
1854 ;; conversion methods on Kernel
1855 (list (concat "\\(?:^\\|[^.@$]\\|\\.\\.\\)"
1856 (regexp-opt '("Array" "Complex" "Float" "Hash"
1857 "Integer" "Rational" "String") 'symbols))
1858 1 font-lock-builtin-face)
1854 ;; expression expansion 1859 ;; expression expansion
1855 '(ruby-match-expression-expansion 1860 '(ruby-match-expression-expansion
1856 2 font-lock-variable-name-face t) 1861 2 font-lock-variable-name-face t)