From 39c46b43780ad00ea27a93d92aadd44753d4c3ea Mon Sep 17 00:00:00 2001
From: Sean Dewar <seandewar@users.noreply.github.com>
Date: Thu, 12 May 2022 17:44:29 +0100
Subject: patch 8.2.4943: changing 'switchbuf' may have no effect

Problem:    Changing 'switchbuf' may have no effect.
Solution:   Handle 'switchbuf' in didset_string_options(). (Sean Dewar,
            closes #10406)
---
 src/optionstr.c              |  1 +
 src/testdir/test_options.vim | 11 +++++++++++
 src/version.c                |  2 ++
 3 files changed, 14 insertions(+)

diff --git a/src/optionstr.c b/src/optionstr.c
index 26dd55120b..73a57703b8 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -125,6 +125,7 @@ didset_string_options(void)
 #if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK)
     (void)opt_strings_flags(p_tbis, p_tbis_values, &tbis_flags, FALSE);
 #endif
+    (void)opt_strings_flags(p_swb, p_swb_values, &swb_flags, TRUE);
 }
 
 #if defined(FEAT_EVAL)
diff --git a/src/testdir/test_options.vim b/src/testdir/test_options.vim
index 8854ffd240..0a533152b9 100644
--- a/src/testdir/test_options.vim
+++ b/src/testdir/test_options.vim
@@ -1299,4 +1299,15 @@ func Test_set_completion_2()
   set wildoptions=
 endfunc
 
+func Test_switchbuf_reset()
+  set switchbuf=useopen
+  sblast
+  call assert_equal(1, winnr('$'))
+  set all&
+  call assert_equal('', &switchbuf)
+  sblast
+  call assert_equal(2, winnr('$'))
+  only!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 480acfda11..0ebc9cbe92 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4943,
 /**/
     4942,
 /**/
-- 
cgit v1.2.3