| author | John Beck <John.Beck@Oracle.COM> |
| Thu, 30 Jul 2015 07:06:12 -0700 | |
| changeset 4721 | 0cedda14cdba |
| permissions | -rw-r--r-- |
|
4721
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
1 |
Ported from 2.7, to deal with readline upgrade. |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
2 |
|
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
3 |
--- Python-2.6.8/Modules/readline.c.~1~ 2012-04-10 08:32:10.000000000 -0700 |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
4 |
+++ Python-2.6.8/Modules/readline.c 2015-07-30 06:43:44.942800226 -0700 |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
5 |
@@ -801,7 +801,7 @@ |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
6 |
* before calling the normal completer */ |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
7 |
|
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
8 |
static char ** |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
9 |
-flex_complete(char *text, int start, int end) |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
10 |
+flex_complete(const char *text, int start, int end) |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
11 |
{
|
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
12 |
#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
13 |
rl_completion_append_character ='\0'; |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
14 |
@@ -841,12 +841,12 @@ |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
15 |
rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
|
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
16 |
rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
|
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
17 |
/* Set our hook functions */ |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
18 |
- rl_startup_hook = (Function *)on_startup_hook; |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
19 |
+ rl_startup_hook = on_startup_hook; |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
20 |
#ifdef HAVE_RL_PRE_INPUT_HOOK |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
21 |
- rl_pre_input_hook = (Function *)on_pre_input_hook; |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
22 |
+ rl_pre_input_hook = on_pre_input_hook; |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
23 |
#endif |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
24 |
/* Set our completion function */ |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
25 |
- rl_attempted_completion_function = (CPPFunction *)flex_complete; |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
26 |
+ rl_attempted_completion_function = flex_complete; |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
27 |
/* Set Python word break characters */ |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
28 |
rl_completer_word_break_characters = |
|
0cedda14cdba
21526665 new readline upsets python 2.6
John Beck <John.Beck@Oracle.COM>
parents:
diff
changeset
|
29 |
strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?");
|