cpython: 3c3624fec6c8 (original) (raw)

Mercurial > cpython

changeset 88673:3c3624fec6c8

merge 3.3 (#20374) [#20374]

Benjamin Peterson benjamin@python.org
date	Fri, 24 Jan 2014 11:44:40 -0500
parents	3e7eddf7b328(current diff)fc62fcd8e990(diff)
children	eca51c887c37
files	Modules/readline.c
diffstat	1 files changed, 4 insertions(+), 4 deletions(-)[+] [-] Modules/readline.c 8

line wrap: on

line diff

--- a/Modules/readline.c +++ b/Modules/readline.c @@ -935,7 +935,7 @@ on_completion(const char *text, int stat

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 =