1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge 3.3 (#20374)

Browse Source
This commit is contained in:
Benjamin Peterson 2014-01-24 00:33:25 -05:00
commit 8f81c3cf3f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -43,6 +43,8 @@ Library
loop this caused is now avoided by checking if the expected context is loop this caused is now avoided by checking if the expected context is
already set before trying to fix it. already set before trying to fix it.
- Issue #20374: Fix build with GNU readline >= 6.3.
- Issue #20311: select.epoll.poll() now rounds the timeout away from zero, - Issue #20311: select.epoll.poll() now rounds the timeout away from zero,
instead of rounding towards zero. For example, a timeout of one microsecond instead of rounding towards zero. For example, a timeout of one microsecond
is now rounded to one millisecond, instead of being rounded to zero. is now rounded to one millisecond, instead of being rounded to zero.

6
Modules/readline.c
View File

@ -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 = (Function *)on_startup_hook; rl_startup_hook = (rl_hook_func_t *)on_startup_hook;
#ifdef HAVE_RL_PRE_INPUT_HOOK #ifdef HAVE_RL_PRE_INPUT_HOOK
rl_pre_input_hook = (Function *)on_pre_input_hook; rl_pre_input_hook = (rl_hook_func_t *)on_pre_input_hook;
#endif #endif
/* Set our completion function */ /* Set our completion function */
rl_attempted_completion_function = (CPPFunction *)flex_complete; rl_attempted_completion_function = (rl_completion_func_t *)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 =