cpython: eb251e3624df (original) (raw)
Mercurial > cpython
changeset 88665:eb251e3624df
merge 3.3 (#20374) [#20374]
| Benjamin Peterson benjamin@python.org | |
|---|---|
| date | Fri, 24 Jan 2014 00:33:25 -0500 |
| parents | c3e787c44885(current diff)fb2259d9f6b4(diff) |
| children | a0bf53afedfa |
| files | Misc/NEWS Modules/readline.c |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-)[+] [-] Misc/NEWS 2 Modules/readline.c 6 |
line wrap: on
line diff
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -43,6 +43,8 @@ Library loop this caused is now avoided by checking if the expected context is 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, instead of rounding towards zero. For example, a timeout of one microsecond is now rounded to one millisecond, instead of being rounded to zero.
--- a/Modules/readline.c +++ b/Modules/readline.c @@ -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 */