Attachment #42907 for bug #69407

Lines 1414-1420 Link Here

(-)bash-3.0.orig/lib/readline/display.c (-1 / +1 lines)
1414	insert_some_chars (nfd, lendiff, col_lendiff);	1414	insert_some_chars (nfd, lendiff, col_lendiff);
1415	_rl_last_c_pos += col_lendiff;	1415	_rl_last_c_pos += col_lendiff;
1416	}	1416	}
1417	else if (*ols == 0 && lendiff > 0)	1417	else if ((MB_CUR_MAX == 1 \|\| rl_byte_oriented != 0) && *ols == 0 && col_lendiff > 0)
1418	{	1418	{
1419	/* At the end of a line the characters do not have to	1419	/* At the end of a line the characters do not have to
1420	be "inserted". They can just be placed on the screen. */	1420	be "inserted". They can just be placed on the screen. */





  /* Only a closing `?' or a newline delimit a substring search string. */
  for (local_index = i; c = string[i]; i++)
  {
#if defined (HANDLE_MULTIBYTE)
    if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
      {

	    continue;
	  }
      }
    else
#endif /* HANDLE_MULTIBYTE */
      if ((!substring_okay && (whitespace (c) || c == ':' ||
	  (history_search_delimiter_chars && member (c, history_search_delimiter_chars)) ||

	  string[i] == '\n' ||
	  (substring_okay && string[i] == '?'))
	break;
  }
  which = i - local_index;
  temp = (char *)xmalloc (1 + which);
  if (which)

Return to bug 69407

Lines 206-211 Link Here

(-)bash-3.0.orig/lib/readline/histexpand.c (-2 / +2 lines)
206		206
207	/* Only a closing `?' or a newline delimit a substring search string. */	207	/* Only a closing `?' or a newline delimit a substring search string. */
208	for (local_index = i; c = string[i]; i++)	208	for (local_index = i; c = string[i]; i++)
		209	{
209	#if defined (HANDLE_MULTIBYTE)	210	#if defined (HANDLE_MULTIBYTE)
210	if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)	211	if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
211	{	212	{
Lines 222-228 Link Here
222	continue;	223	continue;
223	}	224	}
224	}	225	}
225	else
226	#endif /* HANDLE_MULTIBYTE */	226	#endif /* HANDLE_MULTIBYTE */
227	if ((!substring_okay && (whitespace (c) \|\| c == ':' \|\|	227	if ((!substring_okay && (whitespace (c) \|\| c == ':' \|\|
228	(history_search_delimiter_chars && member (c, history_search_delimiter_chars)) \|\|	228	(history_search_delimiter_chars && member (c, history_search_delimiter_chars)) \|\|
Lines 230-236 Link Here
230	string[i] == '\n' \|\|	230	string[i] == '\n' \|\|
231	(substring_okay && string[i] == '?'))	231	(substring_okay && string[i] == '?'))
232	break;	232	break;
233		233	}
234	which = i - local_index;	234	which = i - local_index;
235	temp = (char *)xmalloc (1 + which);	235	temp = (char *)xmalloc (1 + which);
236	if (which)	236	if (which)