commit readline-20201109 snapshot

diff --git a/CHANGES b/CHANGES
index 79628e85a0533290044df4b03cc990362098d83f..747fa41962f2ee6604a6354b691ea5a136a7487d 100644 (file)
--- 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 c3286288dd47c8ddd2c8928480c0e1ea60e80d4b..56ab93aa1b98f5bfc988cbf798e14def60ae4586 100644 (file)
--- 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 8c841f76458583a5370aae856daaa843641f397c..ef65e5f553df66beea5726a9d4ead3497509a17b 100644 (file)
--- 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)