diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-01-24 16:44:40 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-01-24 16:44:40 (GMT) |
| commit | c3bf14d1ebce053852298d4a83d524afa670ffc7 (patch) | |
| tree | c881c86ac8de87b97257d5afaa80ed0a4123fe80 | |
| parent | 4b4f9ebfea4148b9d483aefb24f88c18e1f505b4 (diff) | |
| parent | f0b463ad845c7433a0c561ef2c71d350f4b508c5 (diff) | |
| download | cpython-c3bf14d1ebce053852298d4a83d524afa670ffc7.zip cpython-c3bf14d1ebce053852298d4a83d524afa670ffc7.tar.gz cpython-c3bf14d1ebce053852298d4a83d524afa670ffc7.tar.bz2 | |
merge 3.3 (#20374)
| -rw-r--r-- | Modules/readline.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/readline.c b/Modules/readline.c index ed83818..02521aa 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -935,7 +935,7 @@ on_completion(const char *text, int state) * before calling the normal completer */ static char ** -flex_complete(char *text, int start, int end) +flex_complete(const char *text, int start, int end) { char **result; #ifdef WITH_THREAD @@ -998,12 +998,12 @@ setup_readline(readlinestate *mod_state) rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap); rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap); /* Set our hook functions */ - rl_startup_hook = (rl_hook_func_t *)on_startup_hook; + rl_startup_hook = on_startup_hook; #ifdef HAVE_RL_PRE_INPUT_HOOK - rl_pre_input_hook = (rl_hook_func_t *)on_pre_input_hook; + rl_pre_input_hook = on_pre_input_hook; #endif /* Set our completion function */ - rl_attempted_completion_function = (rl_completion_func_t *)flex_complete; + rl_attempted_completion_function = flex_complete; /* Set Python word break characters */ completer_word_break_characters = rl_completer_word_break_characters = |