aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2013-06-22 17:25:43 +0400
committerDmitry Gutov2013-06-22 17:25:43 +0400
commit12adebe94e4026ce2fb961f87a5790ec7693ae94 (patch)
treec999e4a55cde30f560a92426fe6d3540e7e2d2cc
parentc9509ef46550de70e252fea48c07db59739666c0 (diff)
downloademacs-12adebe94e4026ce2fb961f87a5790ec7693ae94.tar.gz
emacs-12adebe94e4026ce2fb961f87a5790ec7693ae94.zip
* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Move `catch',
add some more keyword-like methods. http://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00911.html
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/ruby-mode.el17
2 files changed, 21 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec5e91005ec..4c41e712226 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12013-06-22 Dmitry Gutov <dgutov@yandex.ru>
2
3 * progmodes/ruby-mode.el (ruby-font-lock-keywords): Move `catch',
4 add some more keyword-like methods.
5 http://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00911.html
6
12013-06-22 Juanma Barranquero <lekktu@gmail.com> 72013-06-22 Juanma Barranquero <lekktu@gmail.com>
2 8
3 * bs.el (bs-buffer-show-mark): Make defvar-local. 9 * bs.el (bs-buffer-show-mark): Make defvar-local.
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 0755afc285f..ab5634e5274 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -1735,7 +1735,6 @@ See `font-lock-syntax-table'.")
1735 "begin" 1735 "begin"
1736 "break" 1736 "break"
1737 "case" 1737 "case"
1738 "catch"
1739 "class" 1738 "class"
1740 "def" 1739 "def"
1741 "defined?" 1740 "defined?"
@@ -1770,14 +1769,28 @@ See `font-lock-syntax-table'.")
1770 (regexp-opt 1769 (regexp-opt
1771 '("alias_method" 1770 '("alias_method"
1772 "autoload" 1771 "autoload"
1772 "attr"
1773 "attr_accessor"
1774 "attr_reader"
1775 "attr_writer"
1776 "catch"
1777 "define_method"
1778 "extend"
1779 "fail"
1780 "include"
1781 "lambda"
1782 "loop"
1773 "module_function" 1783 "module_function"
1774 "private" 1784 "private"
1785 "proc"
1775 "protected" 1786 "protected"
1776 "public" 1787 "public"
1777 "raise" 1788 "raise"
1789 "refine"
1778 "require" 1790 "require"
1779 "require_relative" 1791 "require_relative"
1780 "throw") 1792 "throw"
1793 "using")
1781 'symbols) 1794 'symbols)
1782 "\\)") 1795 "\\)")
1783 2 1796 2