traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 3.3 (#20374)

This commit is contained in:
Benjamin Peterson 2014-01-24 11:44:40 -05:00
parent 4b4f9ebfea f0b463ad84
commit c3bf14d1eb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/readline.c
View File

@ -935,7 +935,7 @@ on_completion(const char *text, int state)
* before calling the normal completer */ * before calling the normal completer */
static char ** static char **
flex_complete(char *text, int start, int end) flex_complete(const char *text, int start, int end)
{ {
char **result; char **result;
#ifdef WITH_THREAD #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 ('\t', rl_complete, emacs_meta_keymap);
rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap); rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
/* Set our hook functions */ /* 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 #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 #endif
/* Set our completion function */ /* 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 */ /* Set Python word break characters */
completer_word_break_characters = completer_word_break_characters =
rl_completer_word_break_characters = rl_completer_word_break_characters =