Merge pull request #23054 from bfredl/nobehave

feat(ex_cmds)!: remove :behave

5 files changed, 2 insertions, 61 deletions

diff --git a/test/old/testdir/test_alot.vim b/test/old/testdir/test_alot.vim
index a3d240f27e..4a22315b9f 100644
--- a/test/old/testdir/test_alot.vim
+++ b/test/old/testdir/test_alot.vim
@@ -2,7 +2,6 @@
 " This makes testing go faster, since Vim doesn't need to restart.
 
 source test_backup.vim
-source test_behave.vim
 source test_compiler.vim
 source test_ex_equal.vim
 source test_ex_undo.vim
diff --git a/test/old/testdir/test_behave.vim b/test/old/testdir/test_behave.vim
deleted file mode 100644
index c26bfe7ce3..0000000000
--- a/test/old/testdir/test_behave.vim
+++ /dev/null
@@ -1,29 +0,0 @@
-" Test the :behave command
-
-func Test_behave()
-  behave mswin
-  call assert_equal('mouse,key', &selectmode)
-  call assert_equal('popup', &mousemodel)
-  call assert_equal('startsel,stopsel', &keymodel)
-  call assert_equal('exclusive', &selection)
-
-  behave xterm
-  call assert_equal('', &selectmode)
-  call assert_equal('extend', &mousemodel)
-  call assert_equal('', &keymodel)
-  call assert_equal('inclusive', &selection)
-
-  set selection&
-  set mousemodel&
-  set keymodel&
-  set selection&
-endfunc
-
-func Test_behave_completion()
-  call feedkeys(":behave \<C-A>\<C-B>\"\<CR>", 'tx')
-  call assert_equal('"behave mswin xterm', @:)
-endfunc
-
-func Test_behave_error()
-  call assert_fails('behave x', 'E475:')
-endfunc
diff --git a/test/old/testdir/test_cmdline.vim b/test/old/testdir/test_cmdline.vim
index 6b2a754dd1..37c284064e 100644
--- a/test/old/testdir/test_cmdline.vim
+++ b/test/old/testdir/test_cmdline.vim
@@ -453,11 +453,6 @@ func Test_getcompletion()
   let l = getcompletion('blahblah', 'augroup')
   call assert_equal([], l)
 
-  let l = getcompletion('', 'behave')
-  call assert_true(index(l, 'mswin') >= 0)
-  let l = getcompletion('not', 'behave')
-  call assert_equal([], l)
-
   let l = getcompletion('', 'color')
   call assert_true(index(l, 'default') >= 0)
   let l = getcompletion('dirty', 'color')
@@ -2768,25 +2763,6 @@ func Test_fuzzy_completion_bufname_fullpath()
   set wildoptions&
 endfunc
 
-" :behave suboptions fuzzy completion
-func Test_fuzzy_completion_behave()
-  set wildoptions&
-  call feedkeys(":behave xm\<Tab>\<C-B>\"\<CR>", 'tx')
-  call assert_equal('"behave xm', @:)
-  call feedkeys(":behave xt*m\<Tab>\<C-B>\"\<CR>", 'tx')
-  call assert_equal('"behave xterm', @:)
-  set wildoptions=fuzzy
-  call feedkeys(":behave xm\<Tab>\<C-B>\"\<CR>", 'tx')
-  call assert_equal('"behave xterm', @:)
-  call feedkeys(":behave xt*m\<Tab>\<C-B>\"\<CR>", 'tx')
-  call assert_equal('"behave xt*m', @:)
-  let g:Sline = ''
-  call feedkeys(":behave win\<C-D>\<F4>\<C-B>\"\<CR>", 'tx')
-  call assert_equal('mswin', g:Sline)
-  call assert_equal('"behave win', @:)
-  set wildoptions&
-endfunc
-
 " " colorscheme name fuzzy completion - NOT supported
 " func Test_fuzzy_completion_colorscheme()
 " endfunc
diff --git a/test/old/testdir/test_usercommands.vim b/test/old/testdir/test_usercommands.vim
index 898f7a59f1..ac37094b1b 100644
--- a/test/old/testdir/test_usercommands.vim
+++ b/test/old/testdir/test_usercommands.vim
@@ -303,7 +303,6 @@ func Test_CmdErrors()
   call assert_fails('com! -complete=xxx DoCmd :', 'E180:')
   call assert_fails('com! -complete=custom DoCmd :', 'E467:')
   call assert_fails('com! -complete=customlist DoCmd :', 'E467:')
-  call assert_fails('com! -complete=behave,CustomComplete DoCmd :', 'E468:')
   call assert_fails('com! -complete=file DoCmd :', 'E1208:')
   call assert_fails('com! -nargs=0 -complete=file DoCmd :', 'E1208:')
   call assert_fails('com! -nargs=x DoCmd :', 'E176:')
@@ -391,10 +390,6 @@ func Test_CmdCompletion()
   call feedkeys(":com DoC\<C-A>\<C-B>\"\<CR>", 'tx')
   call assert_equal('"com DoC', @:)
 
-  com! -nargs=1 -complete=behave DoCmd :
-  call feedkeys(":DoCmd \<C-A>\<C-B>\"\<CR>", 'tx')
-  call assert_equal('"DoCmd mswin xterm', @:)
-
   " Test for file name completion
   com! -nargs=1 -complete=file DoCmd :
   call feedkeys(":DoCmd READM\<Tab>\<C-B>\"\<CR>", 'tx')
diff --git a/test/old/testdir/test_visual.vim b/test/old/testdir/test_visual.vim
index 350c69fe4e..75487f8402 100644
--- a/test/old/testdir/test_visual.vim
+++ b/test/old/testdir/test_visual.vim
@@ -485,14 +485,14 @@ endfunc
 
 func Test_visual_block_put_invalid()
   enew!
-  behave mswin
+  set selection=exclusive
   norm yy
   norm v)Ps/^/	
   " this was causing the column to become negative
   silent norm ggv)P
 
   bwipe!
-  behave xterm
+  set selection&
 endfunc
 
 " Visual modes (v V CTRL-V) followed by an operator; count; repeating