patch 8.1.0734: the hlsearch state is not stored in a session file
Problem: The hlsearch state is not stored in a session file.
Solution: Add "nohlsearch" if appropriate. (Jason Franklin)
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 354cc11..7dc6198 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -10144,6 +10144,10 @@
if (put_line(fd, "let &so = s:so_save | let &siso = s:siso_save")
== FAIL)
failed = TRUE;
+# ifdef FEAT_SEARCH_EXTRA
+ if (no_hlsearch && put_line(fd, "nohlsearch") == FAIL)
+ failed = TRUE;
+# endif
if (put_line(fd, "doautoall SessionLoadPost") == FAIL)
failed = TRUE;
if (eap->cmdidx == CMD_mksession)
diff --git a/src/testdir/test_mksession.vim b/src/testdir/test_mksession.vim
index fa08685..4d524da 100644
--- a/src/testdir/test_mksession.vim
+++ b/src/testdir/test_mksession.vim
@@ -198,6 +198,24 @@
call delete('Xtest_mks.out')
endfunc
+if has('extra_search')
+
+func Test_mksession_hlsearch()
+ set hlsearch
+ mksession! Xtest_mks.out
+ nohlsearch
+ source Xtest_mks.out
+ call assert_equal(1, v:hlsearch, 'session should restore search highlighting state')
+ nohlsearch
+ mksession! Xtest_mks.out
+ source Xtest_mks.out
+ call assert_equal(0, v:hlsearch, 'session should restore search highlighting state')
+ call delete('Xtest_mks.out')
+endfunc
+
+endif
+
+
func Test_mksession_blank_windows()
split
split
diff --git a/src/version.c b/src/version.c
index a967fea..11b555f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -796,6 +796,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 734,
+/**/
733,
/**/
732,