X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=interactive.c;h=9f8a5013b44e3bc3cb1119483b30c0687bb08010;hb=72330a682b4db019af84bf9a9ee09bb78681d4ad;hp=bb121f429426f7291c07a7a31a1d0f40f1186c40;hpb=a09c549cb3f6e24b6d68700f854731aea8b8d1a4;p=paraslash.git

diff --git a/interactive.c b/interactive.c
index bb121f42..9f8a5013 100644
--- a/interactive.c
+++ b/interactive.c
@@ -440,6 +440,7 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s)
 {
 	int ret;
 
+	memset(i9ep, 0, sizeof(struct i9e_private));
 	if (!isatty(ici->fds[0]))
 		return -E_I9E_SETUPTERM;
 	ret = mark_fd_nonblocking(ici->fds[0]);
@@ -467,10 +468,12 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s)
 	if (ici->bound_keyseqs) {
 		char *seq;
 		int i;
-		/* bind each key sequence to the our dispatcher */
-		for (i = 0; (seq = ici->bound_keyseqs[i]); i++)
-			rl_generic_bind(ISFUNC, seq, (char *)dispatch_key,
-				i9ep->bare_km);
+		/* bind each key sequence to our dispatcher */
+		for (i = 0; (seq = ici->bound_keyseqs[i]); i++) {
+			if (rl_bind_keyseq_in_map(seq,
+					dispatch_key, i9ep->bare_km) != 0)
+				PARA_WARNING_LOG("could not bind #%d: %s\n", i, seq);
+		}
 		i9ep->num_key_bindings = i;
 	}
 	if (ici->history_file)
@@ -479,7 +482,6 @@ int i9e_open(struct i9e_client_info *ici, struct sched *s)
 	if (ici->producer) {
 		rl_callback_handler_install("", i9e_line_handler);
 		i9e_attach_to_stdout(ici->producer);
-		rl_set_keymap(i9ep->bare_km);
 	} else
 		rl_callback_handler_install(i9ep->ici->prompt, i9e_line_handler);
 	return 1;