mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

* readline.c (current_input_getc): Don't pass int values through

Browse source 
SCM variables.
This commit is contained in:
Mikael Djurfeldt 2000-03-12 16:02:46 +00:00
parent 0cd8762838
commit bc858b80ca
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
guile-readline/readline.c
View file

@ -125,17 +125,12 @@ static SCM before_read;
static int static int
current_input_getc (FILE *in) current_input_getc (FILE *in)
{ {
SCM ans;
if (promptp && SCM_NIMP (before_read)) if (promptp && SCM_NIMP (before_read))
{ {
scm_apply (before_read, SCM_EOL, SCM_EOL); scm_apply (before_read, SCM_EOL, SCM_EOL);
promptp = 0; promptp = 0;
} }
ans = scm_getc (input_port); return scm_getc (input_port);
/* GJB:FIXME:: why not just
return scm_getc(input_port);
*/
return ans;
} }
static void static void
@ -470,7 +465,7 @@ find_matching_paren(int k)
static int static int
match_paren (int x, int k) match_paren (int x, int k)
{ {
int tmp; int tmp, fno;
SELECT_TYPE readset; SELECT_TYPE readset;
struct timeval timeout; struct timeval timeout;
@ -487,7 +482,8 @@ match_paren (int x, int k)
timeout.tv_sec = tmp / 1000000; timeout.tv_sec = tmp / 1000000;
timeout.tv_usec = tmp % 1000000; timeout.tv_usec = tmp % 1000000;
FD_ZERO (&readset); FD_ZERO (&readset);
FD_SET (fileno (rl_instream), &readset); fno = fileno (rl_instream);
FD_SET (fno, &readset);
if (rl_point > 1) if (rl_point > 1)
{ {
@ -496,7 +492,7 @@ match_paren (int x, int k)
if (rl_point > -1) if (rl_point > -1)
{ {
rl_redisplay (); rl_redisplay ();
scm_internal_select (fileno + 1, &readset, NULL, NULL, &timeout); scm_internal_select (fno + 1, &readset, NULL, NULL, &timeout);
} }
rl_point = tmp; rl_point = tmp;
} }