mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-01 12:20:26 +02:00
Code Activity

Use scm_current_input_port instead of scm_cur_inp. Use scm_std_select

Browse source 
instead of scm_internal_select.
This commit is contained in:
Marius Vollmer 2005-03-02 20:56:34 +00:00
parent d8d925f310
commit 0ddf47fcaa
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
guile-readline/readline.c
View file

@ -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))) || SCM_OPINFPORTP (inp)))
{ {
--in_readline; --in_readline;
@ -181,7 +181,7 @@ SCM_DEFINE (scm_readline, "%readline", 0, 4, 0,
SCM_EOL); SCM_EOL);
} }
if (!((SCM_UNBNDP (outp) && SCM_OPOUTFPORTP (scm_cur_outp)) if (!((SCM_UNBNDP (outp) && SCM_OPOUTFPORTP (scm_current_output_port ()))
|| SCM_OPOUTFPORTP (outp))) || SCM_OPOUTFPORTP (outp)))
{ {
--in_readline; --in_readline;
@ -296,10 +296,10 @@ void
scm_readline_init_ports (SCM inp, SCM outp) scm_readline_init_ports (SCM inp, SCM outp)
{ {
if (SCM_UNBNDP (inp)) if (SCM_UNBNDP (inp))
inp = scm_cur_inp; inp = scm_current_input_port ();
if (SCM_UNBNDP (outp)) if (SCM_UNBNDP (outp))
outp = scm_cur_outp; outp = scm_current_output_port ();
if (!SCM_OPINFPORTP (inp)) { if (!SCM_OPINFPORTP (inp)) {
scm_misc_error (0, scm_misc_error (0,
@ -519,7 +519,7 @@ match_paren (int x, int k)
{ {
rl_redisplay (); rl_redisplay ();
#ifndef __MINGW32__ #ifndef __MINGW32__
scm_internal_select (fno + 1, &readset, NULL, NULL, &timeout); scm_std_select (fno + 1, &readset, NULL, NULL, &timeout);
#else #else
WaitForSingleObject (GetStdHandle(STD_INPUT_HANDLE), WaitForSingleObject (GetStdHandle(STD_INPUT_HANDLE),
SCM_READLINE_BOUNCE_PARENS); SCM_READLINE_BOUNCE_PARENS);