From fae782557c8e042df2235633a3ac247276d3f4ff Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Mon, 23 Mar 2026 09:38:48 +0800
Subject: [PATCH] vim-patch:9.2.0226: No 'incsearch' highlighting support for
 :uniq (#38425)

Problem:  No 'incsearch' highlighting support for :uniq
Solution: Add :uniq support (Hirohito Higashi)

closes: vim/vim#19780

https://github.com/vim/vim/commit/48137e4e48f103f27b4486e9dea18f5d073972fe

Co-authored-by: Hirohito Higashi <h.east.727@gmail.com>
---
 src/nvim/ex_getln.c                    |  2 +-
 test/functional/legacy/search_spec.lua | 36 +++++++++++++++++++++++++-
 test/old/testdir/test_search.vim       | 25 ++++++++++++++++++
 3 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index fdf38bb95f..05d424ceb2 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -317,7 +317,7 @@ bool parse_pattern_and_range(pos_T *incsearch_start, int *search_delim, int *ski
 
   // Skip over the range to find the command.
   char *cmd = skip_range(ea.cmd, NULL);
-  if (vim_strchr("sgvl", (uint8_t)(*cmd)) == NULL) {
+  if (vim_strchr("sgvlu", (uint8_t)(*cmd)) == NULL) {
     return false;
   }
 
diff --git a/test/functional/legacy/search_spec.lua b/test/functional/legacy/search_spec.lua
index 13a55e82b5..70b610c859 100644
--- a/test/functional/legacy/search_spec.lua
+++ b/test/functional/legacy/search_spec.lua
@@ -611,7 +611,41 @@ describe('search cmdline', function()
       the {10:on}e 1           |
       :sort ni u /on^      |
     ]])
-    feed('<esc>')
+    feed('<Esc>')
+
+    feed(':sort! /on')
+    screen:expect([[
+      another {2:on}e 2       |
+      that {10:on}e 3          |
+      the {10:on}e 1           |
+      :sort! /on^          |
+    ]])
+    feed('<Esc>')
+  end)
+
+  -- oldtest: Test_incsearch_uniq_dump().
+  it('incsearch works with :uniq', function()
+    screen:try_resize(20, 4)
+    command('set incsearch hlsearch scrolloff=0')
+    fn.setline(1, { 'another one 2', 'that one 3', 'the one 1' })
+
+    feed(':uniq /on')
+    screen:expect([[
+      another {2:on}e 2       |
+      that {10:on}e 3          |
+      the {10:on}e 1           |
+      :uniq /on^           |
+    ]])
+    feed('<Esc>')
+
+    feed(':uniq! /on')
+    screen:expect([[
+      another {2:on}e 2       |
+      that {10:on}e 3          |
+      the {10:on}e 1           |
+      :uniq! /on^          |
+    ]])
+    feed('<Esc>')
   end)
 
   -- oldtest: Test_incsearch_vimgrep_dump().
diff --git a/test/old/testdir/test_search.vim b/test/old/testdir/test_search.vim
index 829c80ee96..8071eef014 100644
--- a/test/old/testdir/test_search.vim
+++ b/test/old/testdir/test_search.vim
@@ -1261,6 +1261,31 @@ func Test_incsearch_sort_dump()
   call StopVimInTerminal(buf)
 endfunc
 
+" Similar to Test_incsearch_sort_dump() for :uniq
+func Test_incsearch_uniq_dump()
+  CheckOption incsearch
+  CheckScreendump
+
+  call writefile([
+	\ 'set incsearch hlsearch scrolloff=0',
+	\ 'call setline(1, ["another one 2", "that one 3", "the one 1"])',
+	\ ], 'Xis_uniq_script', 'D')
+  let buf = RunVimInTerminal('-S Xis_uniq_script', {'rows': 9, 'cols': 70})
+  " Give Vim a chance to redraw to get rid of the spaces in line 2 caused by
+  " the 'ambiwidth' check.
+  sleep 100m
+
+  call term_sendkeys(buf, ':uniq /on')
+  call VerifyScreenDump(buf, 'Test_incsearch_uniq_01', {})
+  call term_sendkeys(buf, "\<Esc>")
+
+  call term_sendkeys(buf, ':uniq! /on')
+  call VerifyScreenDump(buf, 'Test_incsearch_uniq_02', {})
+  call term_sendkeys(buf, "\<Esc>")
+
+  call StopVimInTerminal(buf)
+endfunc
+
 " Similar to Test_incsearch_substitute_dump() for :vimgrep famiry
 func Test_incsearch_vimgrep_dump()
   CheckOption incsearch