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

* readline.c (scm_init_readline): Only do init_bouncing_parens ()

Browse source 
if HAVE_RL_GET_KEYMAP.
(init_bouncing_parens, find_matching_paren, match_paren): Compile
out if ! HAVE_RL_GET_KEYMAP.

* configure.in: Add check for rl_get_keymap.
This commit is contained in:
Neil Jerram 2008-01-29 23:03:15 +00:00
parent 96d4e139c7
commit 9cfe821f64
3 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
guile-readline/ChangeLog
View file

@ -1,3 +1,12 @@
2008-01-29 Neil Jerram <neil@ossau.uklinux.net>
* readline.c (scm_init_readline): Only do init_bouncing_parens ()
if HAVE_RL_GET_KEYMAP.
(init_bouncing_parens, find_matching_paren, match_paren): Compile
out if ! HAVE_RL_GET_KEYMAP.
* configure.in: Add check for rl_get_keymap.
2007-07-15 Ludovic Courtès <ludo@gnu.org> 2007-07-15 Ludovic Courtès <ludo@gnu.org>
* LIBGUILEREADLINE-VERSION * LIBGUILEREADLINE-VERSION

5
guile-readline/configure.in
View file

@ -43,6 +43,11 @@ AC_CHECK_FUNCS(siginterrupt rl_clear_signals rl_cleanup_after_signal)
dnl Check for modern readline naming dnl Check for modern readline naming
AC_CHECK_FUNCS(rl_filename_completion_function) AC_CHECK_FUNCS(rl_filename_completion_function)
dnl Check for rl_get_keymap. We only use this for deciding whether to
dnl install paren matching on the Guile command line (when using
dnl readline for input), so it's completely optional.
AC_CHECK_FUNCS(rl_get_keymap)
dnl Check for rl_pre_input_hook. This is more complicated because on dnl Check for rl_pre_input_hook. This is more complicated because on
dnl some systems (HP/UX), the linker wont let us treat dnl some systems (HP/UX), the linker wont let us treat
dnl rl_pre_input_hook as a function when it really is a function dnl rl_pre_input_hook as a function when it really is a function

4
guile-readline/readline.c
View file

@ -425,6 +425,7 @@ completion_function (char *text, int continuep)
} }
} }
#if HAVE_RL_GET_KEYMAP
/*Bouncing parenthesis (reimplemented by GH, 11/23/98, since readline is strict gpl)*/ /*Bouncing parenthesis (reimplemented by GH, 11/23/98, since readline is strict gpl)*/
static int match_paren (int x, int k); static int match_paren (int x, int k);
@ -528,6 +529,7 @@ match_paren (int x, int k)
} }
return 0; return 0;
} }
#endif /* HAVE_RL_GET_KEYMAP */
#if defined (HAVE_RL_PRE_INPUT_HOOK) && defined (GUILE_SIGWINCH_SA_RESTART_CLEARED) #if defined (HAVE_RL_PRE_INPUT_HOOK) && defined (GUILE_SIGWINCH_SA_RESTART_CLEARED)
/* Readline disables SA_RESTART on SIGWINCH. /* Readline disables SA_RESTART on SIGWINCH.
@ -576,7 +578,9 @@ scm_init_readline ()
scm_init_opts (scm_readline_options, scm_init_opts (scm_readline_options,
scm_readline_opts, scm_readline_opts,
SCM_N_READLINE_OPTIONS); SCM_N_READLINE_OPTIONS);
#if HAVE_RL_GET_KEYMAP
init_bouncing_parens(); init_bouncing_parens();
#endif
scm_add_feature ("readline"); scm_add_feature ("readline");
#endif /* HAVE_RL_GETC_FUNCTION */ #endif /* HAVE_RL_GETC_FUNCTION */
} }