diff options
author | kouji <kouji@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-03 12:15:20 +0000 |
---|---|---|
committer | kouji <kouji@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-03 12:15:20 +0000 |
commit | dbf657caade698b057f0165aafc12963c1bd22f2 (patch) | |
tree | f72ba5908d00216268ca39377b176fa42ef41449 | |
parent | 8b729eed969b6c7f0229b9182344360e61774c46 (diff) | |
download | ruby-dbf657caade698b057f0165aafc12963c1bd22f2.tar.gz |
* ext/readline/readline.c (readline_s_set_completion_proc): set
default if proc is nil. fix #1095
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22012 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/readline/readline.c | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Feb 3 21:07:19 2009 TAKAO Kouji <kouji@takao7.net> + + * ext/readline/readline.c (readline_s_set_completion_proc): set + default if proc is nil. fix #1095 + Tue Feb 3 16:36:06 2009 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> * array.c (rb_ary_sort_by_bang): RDoc update. diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 7912989c21..feab70fb30 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -304,6 +304,8 @@ readline_s_set_output(VALUE self, VALUE output) * should take input-string, and return an array of completion * candidates. * + * Set default if +proc+ is nil. + * * Raises ArgumentError exception if +proc+ does not respond to call method. * * Raises SecurityError exception if $SAFE is 4. @@ -312,7 +314,7 @@ static VALUE readline_s_set_completion_proc(VALUE self, VALUE proc) { rb_secure(4); - if (!rb_respond_to(proc, rb_intern("call"))) + if (!NIL_P(proc) && !rb_respond_to(proc, rb_intern("call"))) rb_raise(rb_eArgError, "argument must respond to `call'"); return rb_ivar_set(mReadline, completion_proc, proc); } |