diff options
| author | Daniel Llorens <lloda@sarc.name> | 2020-01-27 22:43:56 +0100 |
|---|---|---|
| committer | Daniel Llorens <lloda@sarc.name> | 2020-01-28 11:11:24 +0100 |
| commit | f2781c9604dd1d7f4bf75e61848c4e9dc2221296 (patch) | |
| tree | c181b2dee22b2c169e6b3339ef1a771ea4835c6f /guile-readline | |
| parent | 321fc5b6b86f8f4d0b447d572bf90b9152974b15 (diff) | |
| download | guile-f2781c9604dd1d7f4bf75e61848c4e9dc2221296.tar.gz | |
Fix check for rl_get_keymap
This lets Guile build on OS X (tested on 10.14) with the system-provided
libreadline.
* acinclude.m4 (GUILE_READLINE): Check for rl_get_keymap_name instead of
rl_get_keymap. The system provided libreadline is an alias to libedit,
which has _keymap but not _keymap_name, and Guile uses both.
* guile-readline/readline.c: Adjust the include guard.
Diffstat (limited to 'guile-readline')
| -rw-r--r-- | guile-readline/readline.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/guile-readline/readline.c b/guile-readline/readline.c index b6e290b50..5c4a32689 100644 --- a/guile-readline/readline.c +++ b/guile-readline/readline.c @@ -420,7 +420,7 @@ completion_function (char *text, int continuep) } } -#if HAVE_RL_GET_KEYMAP +#if HAVE_RL_GET_KEYMAP_NAME /*Bouncing parenthesis (reimplemented by GH, 11/23/98, since readline is strict gpl)*/ static int match_paren (int x, int k); @@ -515,7 +515,7 @@ match_paren (int x, int k) } return 0; } -#endif /* HAVE_RL_GET_KEYMAP */ +#endif /* HAVE_RL_GET_KEYMAP_NAME */ #endif /* HAVE_RL_GETC_FUNCTION */ @@ -551,7 +551,7 @@ scm_init_readline () rl_variable_bind ("enable-bracketed-paste", SCM_READLINE_BRACKETED_PASTE ? "on" : "off"); -#if HAVE_RL_GET_KEYMAP +#if HAVE_RL_GET_KEYMAP_NAME init_bouncing_parens(); #endif scm_add_feature ("readline"); |