[Python-checkins] cpython (merge 3.3 -> default): merge 3.3 (#20374)
benjamin.peterson
python-checkins at python.org
Fri Jan 24 17:44:52 CET 2014
http://hg.python.org/cpython/rev/3c3624fec6c8
changeset: 88673:3c3624fec6c8
parent: 88670:3e7eddf7b328
parent: 88672:fc62fcd8e990
user: Benjamin Peterson <benjamin at python.org>
date: Fri Jan 24 11:44:40 2014 -0500
summary:
merge 3.3 (#20374)
files:
Modules/readline.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Modules/readline.c b/Modules/readline.c
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -935,7 +935,7 @@
* 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 @@
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 =
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list