From: Chet Ramey <chet.ramey@case.edu>
Date: Mon, 9 Nov 2020 20:12:08 +0000 (-0500)
Subject: commit readline-20201109 snapshot
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=158dea294e3000d80ae275eb8dcfa4d1cef61b61;p=thirdparty%2Freadline.git

commit readline-20201109 snapshot
---

diff --git a/CHANGES b/CHANGES
index 79628e8..747fa41 100644
--- a/CHANGES
+++ b/CHANGES
@@ -103,7 +103,8 @@ e. rl-clear-display: new bindable command that clears the screen and, if
 
 f. New active mark and face feature: when enabled, it will highlight the text
    inserted by a bracketed paste (the `active region') and the text found by
-   incremental and non-incremental history searches.
+   incremental and non-incremental history searches. This is tied to bracketed
+   paste and can be disabled by turning off bracketed paste.
 
 g. Readline sets the mark in several additional commands.
 
diff --git a/NEWS b/NEWS
index c328628..56ab93a 100644
--- a/NEWS
+++ b/NEWS
@@ -21,7 +21,8 @@ e. rl-clear-display: new bindable command that clears the screen and, if
 
 f. New active mark and face feature: when enabled, it will highlight the text
    inserted by a bracketed paste (the `active region') and the text found by
-   incremental and non-incremental history searches.
+   incremental and non-incremental history searches. This is tied to bracketed
+   paste and can be disabled by turning off bracketed paste.
 
 g. Readline sets the mark in several additional commands.
 
diff --git a/isearch.c b/isearch.c
index 8c841f7..ef65e5f 100644
--- a/isearch.c
+++ b/isearch.c
@@ -418,9 +418,11 @@ add_character:
     {
       /* If we have a multibyte character, see if it's bound to something that
 	 affects the search. */
-      if (cxt->mb[1])
+#if defined (HANDLE_MULTIBYTE)
+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0 && cxt->mb[1])
 	f = rl_function_of_keyseq (cxt->mb, cxt->keymap, (int *)NULL);
       else
+#endif
 	{
 	  f = cxt->keymap[c].function;
 	  if (f == rl_do_lowercase_version)