From 0ddf47fcaadf45cb3b8953f7d99af93e4e7b2181 Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Wed, 2 Mar 2005 20:56:34 +0000 Subject: Use scm_current_input_port instead of scm_cur_inp. Use scm_std_select instead of scm_internal_select. --- guile-readline/readline.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'guile-readline/readline.c') diff --git a/guile-readline/readline.c b/guile-readline/readline.c index c0fe8ec6e..864d4fa41 100644 --- a/guile-readline/readline.c +++ b/guile-readline/readline.c @@ -172,7 +172,7 @@ SCM_DEFINE (scm_readline, "%readline", 0, 4, 0, } } - if (!((SCM_UNBNDP (inp) && SCM_OPINFPORTP (scm_cur_inp)) + if (!((SCM_UNBNDP (inp) && SCM_OPINFPORTP (scm_current_input_port ())) || SCM_OPINFPORTP (inp))) { --in_readline; @@ -181,7 +181,7 @@ SCM_DEFINE (scm_readline, "%readline", 0, 4, 0, SCM_EOL); } - if (!((SCM_UNBNDP (outp) && SCM_OPOUTFPORTP (scm_cur_outp)) + if (!((SCM_UNBNDP (outp) && SCM_OPOUTFPORTP (scm_current_output_port ())) || SCM_OPOUTFPORTP (outp))) { --in_readline; @@ -296,10 +296,10 @@ void scm_readline_init_ports (SCM inp, SCM outp) { if (SCM_UNBNDP (inp)) - inp = scm_cur_inp; + inp = scm_current_input_port (); if (SCM_UNBNDP (outp)) - outp = scm_cur_outp; + outp = scm_current_output_port (); if (!SCM_OPINFPORTP (inp)) { scm_misc_error (0, @@ -519,7 +519,7 @@ match_paren (int x, int k) { rl_redisplay (); #ifndef __MINGW32__ - scm_internal_select (fno + 1, &readset, NULL, NULL, &timeout); + scm_std_select (fno + 1, &readset, NULL, NULL, &timeout); #else WaitForSingleObject (GetStdHandle(STD_INPUT_HANDLE), SCM_READLINE_BOUNCE_PARENS); -- cgit v1.2.3