From 196c3850dbe95247f7aa1b0000a5cae625a99ef2 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 4 Mar 2022 19:22:36 +0000
Subject: [PATCH] patch 8.2.4504: when there is a partially matching map full
 map may not work

Problem:    When there is a partially matching map and modifyOtherKeys is
            active a full map may not work.
Solution:   Only simplify modifiers when there is no matching mapping.
            (closes #8792)
---
 src/getchar.c                  |  4 ++--
 src/testdir/test_termcodes.vim | 17 +++++++++++++++++
 src/version.c                  |  2 ++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/getchar.c b/src/getchar.c
index 2fbbd4f6e1..03d6d4d96d 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -2598,7 +2598,7 @@ handle_mapping(
 	}
 
 	// If no partly match found, use the longest full match.
-	if (keylen != KEYLEN_PART_MAP)
+	if (keylen != KEYLEN_PART_MAP && mp_match != NULL)
 	{
 	    mp = mp_match;
 	    keylen = mp_match_len;
@@ -2643,7 +2643,7 @@ handle_mapping(
 	    max_mlen = mlen + 1;
     }
 
-    if ((mp == NULL || max_mlen >= mp_match_len) && keylen != KEYLEN_PART_MAP)
+    if ((mp == NULL || max_mlen > mp_match_len) && keylen != KEYLEN_PART_MAP)
     {
 	int	save_keylen = keylen;
 
diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim
index 614c0977d7..a68506c1e6 100644
--- a/src/testdir/test_termcodes.vim
+++ b/src/testdir/test_termcodes.vim
@@ -2098,6 +2098,23 @@ func Test_modifyOtherKeys_mapped()
   set timeoutlen&
 endfunc
 
+func Test_modifyOtherKeys_ambiguous_mapping()
+  new
+  set timeoutlen=10
+  map <C-J> a
+  map <C-J>x <Nop>
+  call setline(1, 'x')
+
+  " CTRL-J b should have trigger the <C-J> mapping and then insert "b"
+  call feedkeys(GetEscCodeCSI27('J', 5) .. "b\<Esc>", 'Lx!')
+  call assert_equal('xb', getline(1))
+
+  unmap <C-J>
+  unmap <C-J>x
+  set timeoutlen&
+  bwipe!
+endfunc
+
 " Whether Shift-Tab sends "ESC [ Z" or "ESC [ 27 ; 2 ; 9 ~" is unpredictable,
 " both should work.
 func Test_modifyOtherKeys_shift_tab()
diff --git a/src/version.c b/src/version.c
index 6a21b8a9a4..e1ca0d7e8f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4504,
 /**/
     4503,
 /**/