summaryrefslogtreecommitdiffstats
path: root/ext/readline
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-05-07 09:26:29 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2001-05-07 09:26:29 +0000
commitd7d4acb14eb2fcb505bf8532273e413017045d43 (patch)
treee88cf34d1e19ece721133a8ad3582e8ed4727dc6 /ext/readline
parentb82260bc45cccea93abd4d254f8e14d77fec1d30 (diff)
downloadruby-d7d4acb14eb2fcb505bf8532273e413017045d43.tar.gz
ruby-d7d4acb14eb2fcb505bf8532273e413017045d43.tar.xz
ruby-d7d4acb14eb2fcb505bf8532273e413017045d43.zip
* parse.y (arg): "||=" should not warn for uninitialized instance
variables. * eval.c (rb_eval): ditto. * eval.c (eval): preserve and restore ruby_cref as well. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/readline')
-rw-r--r--ext/readline/readline.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 765a00280..c8ed81ac5 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -18,6 +18,7 @@ static VALUE mReadline;
#ifndef READLINE_42_OR_LATER
# define rl_filename_completion_function filename_completion_function
# define rl_username_completion_function username_completion_function
+# define rl_completion_matches completion_matches
#endif
static int
@@ -327,8 +328,8 @@ filename_completion_proc_call(self, str)
char **matches;
int i;
- matches = completion_matches(StringValuePtr(str),
- rl_filename_completion_function);
+ matches = rl_completion_matches(StringValuePtr(str),
+ rl_filename_completion_function);
if (matches) {
result = rb_ary_new();
for (i = 0; matches[i]; i++) {
@@ -354,8 +355,8 @@ username_completion_proc_call(self, str)
char **matches;
int i;
- matches = completion_matches(StringValuePtr(str),
- rl_username_completion_function);
+ matches = rl_completion_matches(StringValuePtr(str),
+ rl_username_completion_function);
if (matches) {
result = rb_ary_new();
for (i = 0; matches[i]; i++) {