X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=readline%2Freadline.c;h=5eaaf47435e6b87c20f21150a753c0f8f2724f69;hb=4cd712bdad3b84699538ad1e73d860210ab6062c;hp=5e9767ab47f9fbbf7e25a56d82c757f6aeacc304;hpb=b585a9fad59f9d0c07681778b97d36b67bd9748d;p=deliverable%2Fbinutils-gdb.git

diff --git a/readline/readline.c b/readline/readline.c
index 5e9767ab47..5eaaf47435 100644
--- a/readline/readline.c
+++ b/readline/readline.c
@@ -282,6 +282,7 @@ rl_set_prompt (prompt)
 {
   FREE (rl_prompt);
   rl_prompt = prompt ? savestring (prompt) : (char *)NULL;
+  rl_display_prompt = rl_prompt ? rl_prompt : "";
 
   rl_visible_prompt_length = rl_expand_prompt (rl_prompt);
   return 0;
@@ -714,7 +715,7 @@ _rl_dispatch_subseq (key, map, got_subseq)
 
 	  rl_dispatching = 1;
 	  RL_SETSTATE(RL_STATE_DISPATCHING);
-	  r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
+	  (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
 	  RL_UNSETSTATE(RL_STATE_DISPATCHING);
 	  rl_dispatching = 0;