summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-26 17:39:42 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-26 17:39:42 +0000
commit9aaa2da65b2093c21e8417d4d5091d1a7e397fc9 (patch)
tree2d658b32a52bcdfd483bfd708ef31ed7fc8d3f83
parent3898e7b8eec31631a928fa48f7a5f278301a4100 (diff)
* ext/readline/readline.c (readline_getc): the function for
rl_getc_function must be a byte function. so use getbyte method. [ruby-dev:38535] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23591 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--ext/readline/readline.c6
-rw-r--r--version.h4
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5cb2c39..a32c938 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed May 27 02:31:38 2009 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * ext/readline/readline.c (readline_getc): the function for
+ rl_getc_function must be a byte function.
+ so use getbyte method. [ruby-dev:38535]
+
Tue May 26 14:24:17 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* gc.c: fixed types.
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index dee42f0..d86a714 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -106,7 +106,7 @@ static char **readline_attempted_completion_function(const char *text,
#if defined HAVE_RL_GETC_FUNCTION
static VALUE readline_instream;
-static ID id_getc;
+static ID id_getbyte;
static int readline_getc(FILE *);
static int
@@ -117,7 +117,7 @@ readline_getc(FILE *input)
if (!readline_instream) return rl_getc(input);
GetOpenFile(readline_instream, ifp);
if (rl_instream != ifp->stdio_file) return rl_getc(input);
- c = rb_funcall(readline_instream, id_getc, 0, 0);
+ c = rb_funcall(readline_instream, id_getbyte, 0, 0);
if (NIL_P(c)) return EOF;
return NUM2CHR(c);
}
@@ -1372,7 +1372,7 @@ Init_readline()
rl_attempted_completion_function = readline_attempted_completion_function;
#if defined HAVE_RL_GETC_FUNCTION
rl_getc_function = readline_getc;
- id_getc = rb_intern_const("getc");
+ id_getbyte = rb_intern_const("getbyte");
#elif defined HAVE_RL_EVENT_HOOK
rl_event_hook = readline_event;
#endif
diff --git a/version.h b/version.h
index 9a38cd1..8b38a16 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-05-26"
+#define RUBY_RELEASE_DATE "2009-05-27"
#define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk"
@@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 27
#include "ruby/version.h"