2587c2587
<       if (match_list_size > 1 && _rl_complete_show_all)
---
>       if (match_list_size > 1)
2589,2593c2589,2605
< 	  display_matches (matches);
< 	  /* If there are so many matches that the user has to be asked
< 	     whether or not he wants to see the matches, menu completion
< 	     is unwieldy. */
< 	  if (rl_completion_query_items > 0 && match_list_size >= rl_completion_query_items)
---
> 	  if (_rl_complete_show_all)
> 	    {
> 	      display_matches (matches);
> 	      /* If there are so many matches that the user has to be asked
> 		 whether or not he wants to see the matches, menu completion
> 		 is unwieldy. */
> 	      if (rl_completion_query_items > 0 && match_list_size >= rl_completion_query_items)
> 		{
> 		  rl_ding ();
> 		  FREE (matches);
> 		  matches = (char **)0;
> 		  full_completion = 1;
> 		  return (0);
> 		}
> 	    }
> 
> 	  if (_rl_menu_complete_prefix_first) 
2596,2598d2607
< 	      FREE (matches);
< 	      matches = (char **)0;
< 	      full_completion = 1;
2602c2611
<       else if (match_list_size <= 1)
---
>       else
2606,2610d2614
< 	  return (0);
< 	}
<       else if (_rl_menu_complete_prefix_first && match_list_size > 1)
< 	{
< 	  rl_ding ();