patch 9.2.0691: Solaris: Test_terminal_composing_unicode() fails

Problem:  Solaris: Test_terminal_composing_unicode() fails, because
          readline echoes combining UTF-8 input as octal bytes.
Solution: Force C.UTF-8 locale for the terminal test
          (Vladimír Marek).

closes: #20572

Signed-off-by: Vladimír Marek <vlmarek13@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
index 2c6dca1e39e7d634d43cefae4f524459f902dc41..fced4d158b377c8fdf8499849897fbf69697816e 100644 (file)
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -1150,7 +1150,11 @@ func Test_terminal_composing_unicode()
   endif
 
   enew
-  let buf = term_start(cmd, {'curwin': 1})
+  let term_opts = {'curwin': 1}
+  if has('sun')
+    let term_opts.env = {'LC_ALL': 'C.UTF-8'}
+  endif
+  let buf = term_start(cmd, term_opts)
   let g:job = term_getjob(buf)
   call WaitFor({-> term_getline(buf, 1) !=# ''}, 1000)
 

diff --git a/src/version.c b/src/version.c
index 745f523abebeb46200a0a95002790fed7c0cf340..f4375f6e28b74c302de8ab47e9962fb706ced3d5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    691,
 /**/
     690,
 /**/