aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Gutov2015-03-20 07:03:54 +0200
committerDmitry Gutov2015-03-20 07:03:54 +0200
commit8142fc97af742e083fb83e4d0470da59b123a467 (patch)
tree984d4d839ed3a584cd5309752916aee95163c4f7
parent13eb26ad38378e0063e9c9313c3ba8af666629dc (diff)
downloademacs-8142fc97af742e083fb83e4d0470da59b123a467.tar.gz
emacs-8142fc97af742e083fb83e4d0470da59b123a467.zip
ruby-mode: Fix a "required arguments" confusion
* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Move `at_exit' and `callcc' to the "methods with required arguments" section, they need a block argument. Remove a `throw' duplicate.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/ruby-mode.el7
2 files changed, 9 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df2211be169..0172cd052fe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12015-03-20 Dmitry Gutov <dgutov@yandex.ru>
2
3 * progmodes/ruby-mode.el (ruby-font-lock-keywords): Move `at_exit'
4 and `callcc' to the "methods with required arguments" section,
5 they need a block argument. Remove a `throw' duplicate.
6
12015-03-19 Vibhav Pant <vibhavp@gmail.com> 72015-03-19 Vibhav Pant <vibhavp@gmail.com>
2 8
3 * lisp/progmodes/cperl-mode.el (cperl-electric-backspace): 9 * lisp/progmodes/cperl-mode.el (cperl-electric-backspace):
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 921ca314004..f2fb95ce59a 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -2069,8 +2069,10 @@ See `font-lock-syntax-table'.")
2069 ruby-font-lock-keyword-beg-re 2069 ruby-font-lock-keyword-beg-re
2070 (regexp-opt 2070 (regexp-opt
2071 '( ;; built-in methods on Kernel 2071 '( ;; built-in methods on Kernel
2072 "at_exit"
2072 "autoload" 2073 "autoload"
2073 "autoload?" 2074 "autoload?"
2075 "callcc"
2074 "catch" 2076 "catch"
2075 "eval" 2077 "eval"
2076 "exec" 2078 "exec"
@@ -2124,10 +2126,8 @@ See `font-lock-syntax-table'.")
2124 "__dir__" 2126 "__dir__"
2125 "__method__" 2127 "__method__"
2126 "abort" 2128 "abort"
2127 "at_exit"
2128 "binding" 2129 "binding"
2129 "block_given?" 2130 "block_given?"
2130 "callcc"
2131 "caller" 2131 "caller"
2132 "exit" 2132 "exit"
2133 "exit!" 2133 "exit!"
@@ -2143,8 +2143,7 @@ See `font-lock-syntax-table'.")
2143 "readline" 2143 "readline"
2144 "readlines" 2144 "readlines"
2145 "sleep" 2145 "sleep"
2146 "srand" 2146 "srand")
2147 "throw")
2148 'symbols)) 2147 'symbols))
2149 (1 font-lock-builtin-face)) 2148 (1 font-lock-builtin-face))
2150 ;; Here-doc beginnings. 2149 ;; Here-doc beginnings.