Fix documentation, add syntax highlight, add unit tests

Author: ychin

runtime/doc/windows.txt

@@ -286,7 +286,7 @@ window will appear.
                                     " current one
 		    :-curwin help   " opens help in the window before the
                                     " current one
-		    :0curwin help   " opens help in the top left window
+		    :1curwin help   " opens help in the top left window
 		    :$curwin help   " opens help in the bottom right window
 		    :+curwin copen  " opens quickfix in the next window
 		    :3curwin! split " opens current buffer in the 3rd window

runtime/syntax/vim.vim

@@ -25,7 +25,7 @@ syn keyword vimCommand contained	abc[lear] argdo au bel[owright] bp[revious] bro
 syn keyword vimCommand contained	abo[veleft] arge[dit] bN[ext] bf[irst] br[ewind] bufdo c[hange] cat[ch] cdo cg[etfile] checkt[ime] cmapc[lear] colo[rscheme] cope[n] cscope debugg[reedy] deletl dep diffpu[t] dl ds[earch] echoe[rr] en[dif] ex filetype fix[del] for gui helpg[rep] ia in ju[mps] keepp[atterns] laddb[uffer] lbo[ttom] ld[o] lfir[st] lh[elpgrep] lmapc[lear] loadkeymap lpf[ile] luafile mak[e] mk[exrc] mz[scheme] nbs[tart] noh[lsearch] o[pen] ownsyntax pe[rl] pp[op] profd[el] pta[g] ptp[revious] py3 python3 q[uit] red[o] res[ize] rightb[elow] rundo sIg sN[ext] sbN[ext] sbm[odified] scI scp se[t] sfir[st] sgi sh[ell] sign sir sme snoreme spe[llgood] spellw[rong] sre[wind] srp startr[eplace] sunme sy t tabc[lose] tabl[ast] tabp[revious] tcld[o] tj[ump] tn[ext] try una[bbreviate] unlo[ckvar] verb[ose] vimgrepa[dd] wN[ext] winc[md] wq x[it] xnoreme xwininfo
 syn keyword vimCommand contained	al[l] argg[lobal] b[uffer] bl[ast] brea[k] buffers cabc[lear] cb[uffer] ce[nter] cgetb[uffer] chi[story] cn[ext] com cp[revious] cstag delc[ommand] deletp di[splay] diffs[plit] dli[st] dsp[lit] echom[sg] endf[unction] exi[t] filt[er] fo[ld] fu[nction] gvim helpt[ags] iabc[lear] intro k lN[ext] laddf[ile] lc[d] le[ft] lg[etfile] lhi[story] lne[xt] loc[kmarks] lr[ewind] lv[imgrep] marks mks[ession] mzf[ile] new nor ol[dfiles] p[rint] ped[it] pre[serve] promptf[ind] ptf[irst] ptr[ewind] py3do pythonx qa[ll] redi[r] ret[ab] ru[ntime] rv[iminfo] sIl sa[rgument] sb[uffer] sbn[ext] sce scr[iptnames] setf[iletype] sg sgl si sil[ent] sl[eep] smenu snoremenu spelld[ump] spr[evious] srg st[op] stj[ump] sunmenu syn tN[ext] tabd[o] tabm[ove] tabr[ewind] tclf[ile] tl[ast] tno[remap] ts[elect] undoj[oin] uns[ilent] vert[ical] viu[sage] w[rite] windo wqa[ll] xa[ll] xnoremenu y[ank]
 syn keyword vimCommand contained	ar[gs] argl[ocal] ba[ll] bm[odified] breaka[dd] bun[load] cad[dbuffer] cbo[ttom] cex[pr] cgete[xpr] cl[ist] cnew[er] comc[lear] cpf[ile] cuna[bbrev] delel delf[unction] dif[fupdate] difft[his] do e[dit] echon endfo[r] exu[sage] fin[d] foldc[lose] g h[elp] hi if is[earch] kee[pmarks] lNf[ile] lan[guage] lch[dir] lefta[bove] lgetb[uffer] ll lnew[er] lockv[ar] ls lvimgrepa[dd] mat[ch] mksp[ell]
-syn keyword vimCommand contained	ter[minal]
+syn keyword vimCommand contained	ter[minal] cur[win]
 
 syn match   vimCommand contained	"\<z[-+^.=]\=\>"
 syn keyword vimStdPlugin contained	DiffOrig Man N[ext] P[rint] S TOhtml XMLent XMLns

src/ex_docmd.c

@@ -6733,6 +6733,7 @@ uc_check_code(
 #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
 	    {&cmdmod.confirm, "confirm"},
 #endif
+	    {&cmdmod.curwin, "curwin"},
 	    {&cmdmod.hide, "hide"},
 	    {&cmdmod.keepalt, "keepalt"},
 	    {&cmdmod.keepjumps, "keepjumps"},
@@ -6761,9 +6762,6 @@ uc_check_code(
 	/* :botright */
 	if (cmdmod.split & WSP_BOT)
 	    result += add_cmd_modifier(buf, "botright", &multi_mods);
-	/* :curwin */
-	if (cmdmod.curwin > 0)
-	    result += add_cmd_modifier(buf, "curwin", &multi_mods);
 
 	/* the modifiers that are simple flags */
 	for (i = 0; mod_entries[i].varp != NULL; ++i)

src/testdir/test_terminal.vim

@@ -357,6 +357,14 @@ func Test_terminal_curwin()
   call assert_equal(2, winnr('$'))
   bwipe!
 
+  split dummy
+  split dummy2
+  exe '2curwin terminal ' . cmd
+  call assert_equal(2, winnr())
+  call assert_equal(3, winnr('$'))
+  bwipe!
+  bwipe!
+
   split dummy
   call term_start(cmd, {'curwin': 1})
   call assert_equal(2, winnr('$'))

src/testdir/test_usercommands.vim

@@ -17,6 +17,7 @@ function Test_cmdmods()
   bro MyCmd
   confirm MyCmd
   conf MyCmd
+  curwin MyCmd
   hide MyCmd
   hid MyCmd
   keepalt MyCmd
@@ -48,17 +49,17 @@ function Test_cmdmods()
   vertical MyCmd
   vert MyCmd
 
-  aboveleft belowright botright browse confirm hide keepalt keepjumps
+  aboveleft belowright botright browse confirm curwin hide keepalt keepjumps
 	      \ keepmarks keeppatterns lockmarks noswapfile silent tab
 	      \ topleft verbose vertical MyCmd
 
   call assert_equal(' aboveleft aboveleft belowright belowright botright ' .
-      \ 'botright browse browse confirm confirm hide hide ' .
+      \ 'botright browse browse confirm confirm curwin hide hide ' .
       \ 'keepalt keepalt keepjumps keepjumps keepmarks keepmarks ' .
       \ 'keeppatterns keeppatterns aboveleft aboveleft lockmarks lockmarks noswapfile ' .
       \ 'noswapfile belowright belowright silent silent tab topleft topleft verbose verbose ' .
       \ 'vertical vertical ' .
-      \ 'aboveleft belowright botright browse confirm hide keepalt keepjumps ' .
+      \ 'aboveleft belowright botright browse confirm curwin hide keepalt keepjumps ' .
       \ 'keepmarks keeppatterns lockmarks noswapfile silent tab topleft ' .
       \ 'verbose vertical ', g:mods)
 

src/testdir/test_window_cmd.vim

@@ -103,6 +103,44 @@ func Test_window_vertical_split()
   bw
 endfunc
 
+func Test_window_curwin()
+  call assert_equal(1, winnr('$'))
+  split
+  split
+  split
+  call assert_equal(4, winnr('$'))
+
+  2wincmd w
+  curwin help
+  call assert_equal(2, winnr())
+  3curwin sp
+  call assert_equal(3, winnr())
+  +curwin sp
+  call assert_equal(4, winnr())
+  1curwin sp
+  call assert_equal(1, winnr())
+  call assert_equal(4, winnr('$'))
+
+  bw
+
+  " Now test whether :curwin! works in discarding changes
+  new
+  new
+  put ='text'
+  let l:bufnr = bufnr('%')
+
+  2wincmd w
+  call assert_fails('1curwin sp', 'E37:')
+  call assert_true(bufloaded(l:bufnr))
+  1curwin! sp
+  call assert_false(bufloaded(l:bufnr))
+  call assert_equal(1, winnr())
+  call assert_equal(3, winnr('$'))
+
+  bw!
+  call assert_equal(1, winnr('$'))
+endfunc
+
 func Test_window_split_edit_alternate()
   e Xa
   e Xb
@@ -322,7 +360,7 @@ func Test_equalalways_on_close()
   set equalalways
   vsplit
   windo split
-  split 
+  split
   wincmd J
   " now we have a frame top-left with two windows, a frame top-right with two
   " windows and a frame at the bottom, full-width.