OSDN > Find Software > Vim > SCM > hg > vim > Commit

Vim
Fork

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim

Commit MetaInfo

Revision	83a006f81bac04bf9b975347bf8d6bddc7996eb6 (tree)
Time	2006-02-17 07:11:02
Author	vimboss
Commiter	vimboss

Log Message

updated for version 7.0199

Change Summary

modified: runtime/doc/syntax.txt (diff)
modified: runtime/doc/tips.txt (diff)
modified: runtime/doc/todo.txt (diff)
modified: runtime/doc/usr_06.txt (diff)
modified: runtime/doc/version7.txt (diff)
modified: runtime/ftplugin/vhdl.vim (diff)
modified: runtime/syntax/colortest.vim (diff)
modified: runtime/syntax/vim.vim (diff)
modified: src/auto/configure (diff)
modified: src/buffer.c (diff)
modified: src/configure.in (diff)
modified: src/diff.c (diff)
modified: src/eval.c (diff)
modified: src/ex_cmds2.c (diff)
modified: src/ex_docmd.c (diff)
modified: src/globals.h (diff)
modified: src/if_mzsch.c (diff)
modified: src/if_python.c (diff)
modified: src/if_ruby.c (diff)
modified: src/main.c (diff)
modified: src/mark.c (diff)
modified: src/misc1.c (diff)
modified: src/misc2.c (diff)
modified: src/normal.c (diff)
modified: src/option.c (diff)
modified: src/proto/ex_docmd.pro (diff)
modified: src/proto/window.pro (diff)
modified: src/screen.c (diff)
modified: src/structs.h (diff)
modified: src/version.h (diff)
modified: src/window.c (diff)

Incremental Difference

diff -r f892bda292a8 -r 83a006f81bac runtime/doc/syntax.txt

--- a/runtime/doc/syntax.txt Wed Feb 15 22:18:42 2006 +0000

+++ b/runtime/doc/syntax.txt Thu Feb 16 22:11:02 2006 +0000

		@@ -1,4 +1,4 @@
1		-syntax.txt For Vim version 7.0aa. Last change: 2006 Jan 23
	1	+syntax.txt For Vim version 7.0aa. Last change: 2006 Feb 16
2	2
3	3
4	4	VIM REFERENCE MANUAL by Bram Moolenaar

		@@ -4257,9 +4257,8 @@
4257	4257	<
4258	4258	colortest.vim
4259	4259	To test your color setup, a file has been included in the Vim distribution.
4260		-To use it, execute these commands: >
4261		- :e $VIMRUNTIME/syntax/colortest.vim
4262		- :so %
	4260	+To use it, execute this command: >
	4261	+ :runtime syntax/colortest.vim
4263	4262
4264	4263	Some versions of xterm (and other terminals, like the Linux console) can
4265	4264	output lighter foreground colors, even though the number of colors is defined

diff -r f892bda292a8 -r 83a006f81bac runtime/doc/tips.txt

--- a/runtime/doc/tips.txt Wed Feb 15 22:18:42 2006 +0000

+++ b/runtime/doc/tips.txt Thu Feb 16 22:11:02 2006 +0000

		@@ -1,4 +1,4 @@
1		-tips.txt For Vim version 7.0aa. Last change: 2006 Feb 13
	1	+tips.txt For Vim version 7.0aa. Last change: 2006 Feb 16
2	2
3	3
4	4	VIM REFERENCE MANUAL by Bram Moolenaar

		@@ -494,7 +494,7 @@
494	494	endif
495	495	endfunction
496	496
497		- autocmd CursorMoved * call s:Highlight_Matching_Paren()
	497	+ autocmd CursorMoved,CursorMovedI * call s:Highlight_Matching_Paren()
498	498	autocmd InsertEnter * match none
499	499	<
500	500

diff -r f892bda292a8 -r 83a006f81bac runtime/doc/todo.txt

--- a/runtime/doc/todo.txt Wed Feb 15 22:18:42 2006 +0000

+++ b/runtime/doc/todo.txt Thu Feb 16 22:11:02 2006 +0000

		@@ -1,4 +1,4 @@
1		-todo.txt For Vim version 7.0aa. Last change: 2006 Feb 15
	1	+todo.txt For Vim version 7.0aa. Last change: 2006 Feb 16
2	2
3	3
4	4	VIM REFERENCE MANUAL by Bram Moolenaar

		@@ -32,20 +32,23 @@
32	32
33	33	Support WINDOW TABS. Works like several pages, each with their own split
34	34	windows. Let's call them "tab pages".
35		- - Mouse click in tab name should select that tab.
36		- - line at top of frame with tabs.
37		- for the name ignore the help window, unless it's the only one).
38		- Add a number for the window count?
39		- Add a '+' if one of the windows is modified?
40		- Add 'tabtext' option, like 'statusline'.
41		- Add an "X" to close the current tab (like firefox).
42		- - When deleting a buffer also close windows in other tab pages.
43		- - check all places where firstwin and lastwin are used
	35	+ - check all places where lastwin is used
	36	+ - check all places where win_valid() is used
	37	+ - check all places where last_window() is used
	38	+ - ":tabclose N" close tab N
	39	+ - Add ":tabonly" - close all other tabs.
44	40	- check all places wheren only_one_window() is used.
45	41	- Add tabpage(): returns current tab page number.
	42	+ - ":tabsplit" makes a copy of the current tab page.
	43	+ - Add TabLeavePre and TabEnterPost autocommands
	44	+ - line at top of frame with tabs.
	45	+ Add 'tabtext' option, like 'statusline'.
	46	+ - make a diff for each tab page separately.
46	47	- E999
47		- - ":tabclose N" close tab N
48	48	- docs:
	49	+ General remark: commands that work on windows only work on the windows
	50	+ in the current tab page. Including :windo.
	51	+ Session file only contains the current tab page.
49	52	:tabedit
50	53	:tabfind
51	54	:tab N

		@@ -57,6 +60,12 @@
57	60	next one. Hint in docs: To mess with another buffer, without
58	61	changing the window layout, do this in another tab.
59	62	'tabline' values 0/1/2
	63	+ mouse click in tabline:
	64	+ select a tab page
	65	+ X closes current tab page
	66	+ :argall and :ball only opens window for buffers that are not in any
	67	+ window in any tab page
	68	+ :diffoff only in the current tab page
60	69	- add GUI Tabs for some systems.
61	70	Patch for GTK 1.2 passed on by Christian Michon, 2004 Jan 6.
62	71	Simple patch for GTK by Luis M (nov 7).

		@@ -65,11 +74,15 @@
65	74
66	75	Crash with X command server (Ciaran McCreesh).
67	76
68		-Ctags still hasn't included the patch...
	77	+Ctags still hasn't included the patch. Darren is looking for someone to do
	78	+maintanance.
69	79
70	80	"fsutil hardlink" can create a hard link on an NTFS file system. (Daniel
71	81	Einspanjer) What library function can detect that?
72	82
	83	+Win32: use GetFileInformationByHandle() to detect hard links on NTFS?
	84	+(George Reilly)
	85	+
73	86	spelling:
74	87	- Also use the spelling dictionary for dictionary completion.
75	88	When 'dictionary' is empty and/or when "kspell" is in 'complete'.

diff -r f892bda292a8 -r 83a006f81bac runtime/doc/usr_06.txt

--- a/runtime/doc/usr_06.txt Wed Feb 15 22:18:42 2006 +0000

+++ b/runtime/doc/usr_06.txt Thu Feb 16 22:11:02 2006 +0000

		@@ -1,4 +1,4 @@
1		-usr_06.txt For Vim version 7.0aa. Last change: 2002 Jul 14
	1	+usr_06.txt For Vim version 7.0aa. Last change: 2006 Feb 16
2	2
3	3	VIM USER MANUAL - by Bram Moolenaar
4	4

		@@ -179,10 +179,9 @@
179	179	colorscheme mine
180	180
181	181	If you want to see what the most often used color combinations look like, use
182		-these commands: >
	182	+this command: >
183	183
184		- :edit $VIMRUNTIME/syntax/colortest.vim
185		- :source %
	184	+ :runtime syntax/colortest.vim
186	185
187	186	You will see text in various color combinations. You can check which ones are
188	187	readable and look nice.

diff -r f892bda292a8 -r 83a006f81bac runtime/doc/version7.txt

--- a/runtime/doc/version7.txt Wed Feb 15 22:18:42 2006 +0000

+++ b/runtime/doc/version7.txt Thu Feb 16 22:11:02 2006 +0000

		@@ -1,4 +1,4 @@
1		-version7.txt For Vim version 7.0aa. Last change: 2006 Feb 14
	1	+version7.txt For Vim version 7.0aa. Last change: 2006 Feb 16
2	2
3	3
4	4	VIM REFERENCE MANUAL by Bram Moolenaar

		@@ -1010,6 +1010,9 @@
1010	1010
1011	1011	Insert mode completion for whole lines now also searches unloaded buffers.
1012	1012
	1013	+The colortest.vim script can now be invoked directly with ":source" or
	1014	+":runtime".
	1015	+
1013	1016	==============================================================================
1014	1017	COMPILE TIME CHANGES compile-changes-7
1015	1018

		@@ -1696,4 +1699,6 @@
1696	1699
1697	1700	'titleold' was included in ":mkexrc" and ":mksession" files.
1698	1701
	1702	+":set background&" didn't use the same logic as was used when starting up.
	1703	+
1699	1704	vim:tw=78:ts=8:ft=help:norl:

diff -r f892bda292a8 -r 83a006f81bac runtime/ftplugin/vhdl.vim

--- a/runtime/ftplugin/vhdl.vim Wed Feb 15 22:18:42 2006 +0000

+++ b/runtime/ftplugin/vhdl.vim Thu Feb 16 22:11:02 2006 +0000

		@@ -1,8 +1,8 @@
1		-" Vim filetype plugin file
2		-" Language: VHDL
3		-" Maintainer: R.Shankar (shankar at txc.stpn.soft.net)
4		-" Last Change: Tue Oct 8
5		-
	1	+" VHDL filetype plugin
	2	+" Language: VHDL
	3	+" Maintainer: R.Shankar <shankar.r?freescale.com>
	4	+" Modified By: Gerald Lai <laigera+vim?gmail.com>
	5	+" Last Change: 2006 Feb 16
6	6
7	7	" Only do this when not done yet for this buffer
8	8	if exists("b:did_ftplugin")

		@@ -20,7 +20,7 @@
20	20	"setlocal comments=sO:\ -,mO:\ \ ,exO:/,s1:/,mb:,ex:/,://
21	21
22	22	" Format comments to be up to 78 characters long
23		-setlocal tw=75
	23	+"setlocal tw=75
24	24
25	25	set cpo-=C
26	26

		@@ -34,8 +34,51 @@
34	34	if ! exists("b:match_words") && exists("loaded_matchit")
35	35	let b:match_ignorecase=1
36	36	let s:notend = '\%(\<end\s\+\)\@<!'
37		- let b:match_words=
38		- \ s:notend . '\<if\>:\<elsif\>:\<else\>:\<end\>\s\+\<if\>,' .
39		- \ s:notend . '\<case\>:\<when\>:\<end\>\s\+\<case\>,' .
40		- \ s:notend . '\<process\>:\<end\>\s\+\<process\>'
	37	+ let b:match_words =
	38	+ \ s:notend.'\<if\>:\<elsif\>:\<else\>:\<end\s\+if\>,'.
	39	+ \ s:notend.'\<case\>:\<when\>:\<end\s\+case\>,'.
	40	+ \ s:notend.'\<loop\>:\<end\s\+loop\>,'.
	41	+ \ s:notend.'\<for\>:\<end\s\+for\>,'.
	42	+ \ s:notend.'\<generate\>:\<end\s\+generate\>,'.
	43	+ \ s:notend.'\<record\>:\<end\s\+record\>,'.
	44	+ \ s:notend.'\<units\>:\<end\s\+units\>,'.
	45	+ \ s:notend.'\<process\>:\<end\s\+process\>,'.
	46	+ \ s:notend.'\<block\>:\<end\s\+block\>,'.
	47	+ \ s:notend.'\<function\>:\<end\s\+function\>,'.
	48	+ \ s:notend.'\<entity\>:\<end\s\+entity\>,'.
	49	+ \ s:notend.'\<component\>:\<end\s\+component\>,'.
	50	+ \ s:notend.'\<architecture\>:\<end\s\+architecture\>,'.
	51	+ \ s:notend.'\<package\>:\<end\s\+package\>,'.
	52	+ \ s:notend.'\<procedure\>:\<end\s\+procedure\>,'.
	53	+ \ s:notend.'\<configuration\>:\<end\s\+configuration\>'
41	54	endif
	55	+
	56	+" count repeat
	57	+function! <SID>CountWrapper(cmd)
	58	+ let i = v:count1
	59	+ if a:cmd[0] == ":"
	60	+ while i > 0
	61	+ execute a:cmd
	62	+ let i = i - 1
	63	+ endwhile
	64	+ else
	65	+ execute "normal! gv\<Esc>"
	66	+ execute "normal ".i.a:cmd
	67	+ let curcol = col(".")
	68	+ let curline = line(".")
	69	+ normal! gv
	70	+ call cursor(curline, curcol)
	71	+ endif
	72	+endfunction
	73	+
	74	+" explore motion
	75	+" keywords: "architecture", "block", "configuration", "component", "entity", "function", "package", "procedure", "process", "record", "units"
	76	+let b:vhdl_explore = '\%(architecture\\|block\\|configuration\\|component\\|entity\\|function\\|package\\|procedure\\|process\\|record\\|units\)'
	77	+noremap <buffer><silent>[[ :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\%(\\<end\\s\\+\\)\\@<!\\<".b:vhdl_explore."\\>\\c\\<Bar>\\%^","bW")')<CR>
	78	+noremap <buffer><silent>]] :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\%(\\<end\\s\\+\\)\\@<!\\<".b:vhdl_explore."\\>\\c\\<Bar>\\%$","W")')<CR>
	79	+noremap <buffer><silent>[] :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\<end\\s\\+".b:vhdl_explore."\\>\\c\\<Bar>\\%^","bW")')<CR>
	80	+noremap <buffer><silent>][ :<C-u>cal <SID>CountWrapper(':cal search("\\%(--.*\\)\\@<!\\<end\\s\\+".b:vhdl_explore."\\>\\c\\<Bar>\\%$","W")')<CR>
	81	+vnoremap <buffer><silent>[[ :<C-u>cal <SID>CountWrapper('[[')<CR>
	82	+vnoremap <buffer><silent>]] :<C-u>cal <SID>CountWrapper(']]')<CR>
	83	+vnoremap <buffer><silent>[] :<C-u>cal <SID>CountWrapper('[]')<CR>
	84	+vnoremap <buffer><silent>][ :<C-u>cal <SID>CountWrapper('][')<CR>

diff -r f892bda292a8 -r 83a006f81bac runtime/syntax/colortest.vim

--- a/runtime/syntax/colortest.vim Wed Feb 15 22:18:42 2006 +0000

+++ b/runtime/syntax/colortest.vim Thu Feb 16 22:11:02 2006 +0000

		@@ -1,7 +1,7 @@
1	1	" Vim script for testing colors
2	2	" Maintainer: Bram Moolenaar <Bram@vim.org>
3	3	" Contributors: Rafael Garcia-Suarez, Charles Campbell
4		-" Last Change: 2001 Jul 28
	4	+" Last Change: 2006 Feb 16
5	5
6	6	" edit this file, then do ":source %", and check if the colors match
7	7

		@@ -52,6 +52,15 @@
52	52	" lightcyan lightcyan_on_white white_on_lightcyan
53	53	" lightcyan_on_black black_on_lightcyan
54	54
	55	+" Open this file in a window if it isn't edited yet.
	56	+" Use the current window if it's empty.
	57	+if &mod \|\| line('$') != 1 \|\| getline(1) != ''
	58	+ new
	59	+endif
	60	+if expand('%:p') != expand('<sfile>:p')
	61	+ exe "edit " . expand('<sfile>')
	62	+endif
	63	+
55	64	syn clear
56	65	8
57	66	while search("_on_", "W") < 55

		@@ -60,6 +69,5 @@
60	69	exec 'hi col_'.col1.'_'.col2.' ctermfg='.col1.' guifg='.col1.' ctermbg='.col2.' guibg='.col2
61	70	exec 'syn keyword col_'.col1.'_'.col2.' '.col1.'_on_'.col2
62	71	endwhile
63		-8,55g/^" \a/exec 'hi col_'.expand("<cword>").' ctermfg='.expand("<cword>").' guifg='.expand("<cword>")\|
64		- \ exec 'syn keyword col_'.expand("<cword>")." ".expand("<cword>")
	72	+8,54g/^" \a/exec 'hi col_'.expand("<cword>").' ctermfg='.expand("<cword>").' guifg='.expand("<cword>")\| exec 'syn keyword col_'.expand("<cword>")." ".expand("<cword>")
65	73	nohlsearch

diff -r f892bda292a8 -r 83a006f81bac runtime/syntax/vim.vim

--- a/runtime/syntax/vim.vim Wed Feb 15 22:18:42 2006 +0000

+++ b/runtime/syntax/vim.vim Thu Feb 16 22:11:02 2006 +0000

		@@ -1,8 +1,8 @@
1	1	" Vim syntax file
2	2	" Language: Vim 7.0 script
3	3	" Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
4		-" Last Change: February 07, 2006
5		-" Version: 7.0-25
	4	+" Last Change: February 15, 2006
	5	+" Version: 7.0-26
6	6	" Automatically generated keyword lists: {{{1
7	7
8	8	" Quit when a syntax file was already loaded {{{2

		@@ -16,11 +16,11 @@
16	16	syn cluster vimCommentGroup contains=vimTodo,@Spell
17	17
18	18	" regular vim commands {{{2
19		-syn keyword vimCommand contained ab[breviate] abc[lear] abo[veleft] al[l] arga[dd] argd[elete] argdo arge[dit] argg[lobal] argl[ocal] ar[gs] argu[ment] as[cii] bad[d] ba[ll] bd[elete] be bel[owright] bf[irst] bl[ast] bm[odified] bn[ext] bN[ext] bo[tright] bp[revious] brea[k] breaka[dd] breakd[el] breakl[ist] br[ewind] bro[wse] bufdo b[uffer] buffers bun[load] bw[ipeout] ca[bbrev] cabc[lear] caddb[uffer] cad[dexpr] caddf[ile] cal[l] cat[ch] cb[uffer] cc ccl[ose] cd ce[nter] cex[pr] cf[ile] cfir[st] cg[etfile] c[hange] changes chd[ir] che[ckpath] checkt[ime] cla[st] cl[ist] clo[se] cmapc[lear] cnew[er] cn[ext] cN[ext] cnf[ile] cNf[ile] cnorea[bbrev] col[der] colo[rscheme] comc[lear] comp[iler] conf[irm] con[tinue] cope[n] co[py] cpf[ile] cp[revious] cq[uit] cr[ewind] cuna[bbrev] cu[nmap] cw[indow] debugg[reedy] delc[ommand] d[elete] DeleteFirst delf[unction] delm[arks] diffg[et] diffoff diffpatch diffpu[t] diffsplit diffthis diffu[pdate] dig[raphs] di[splay] dj[ump] dl[ist] dr[op] ds[earch] dsp[lit] echoe[rr] echom[sg] echon e[dit] el[se] elsei[f] em[enu] emenu* endfo[r] endf[unction] en[dif] endt[ry] endw[hile] ene[w] ex exi[t] Explore exu[sage] f[ile] files filetype fina[lly] fin[d] fini[sh] fir[st] fix[del] fo[ld] foldc[lose] folddoc[losed] foldd[oopen] foldo[pen] for fu[nction] g[lobal] go[to] gr[ep] grepa[dd] ha[rdcopy] h[elp] helpf[ind] helpg[rep] helpt[ags] Hexplore hid[e] his[tory] I ia[bbrev] iabc[lear] if ij[ump] il[ist] imapc[lear] inorea[bbrev] is[earch] isp[lit] iuna[bbrev] iu[nmap] j[oin] ju[mps] k keepalt keepj[umps] kee[pmarks] laddb[uffer] lad[dexpr] laddf[ile] lan[guage] la[st] lb[uffer] lc[d] lch[dir] lcl[ose] le[ft] lefta[bove] lex[pr] lf[ile] lfir[st] lg[etfile] lgr[ep] lgrepa[dd] l[ist] ll lla[st] lli[st] lmak[e] lm[ap] lmapc[lear] lnew[er] lne[xt] lN[ext] lnf[ile] lNf[ile] ln[oremap] lo[adview] loc[kmarks] lockv[ar] lol[der] lop[en] lpf[ile] lp[revious] lr[ewind] ls lt[ag] lu[nmap] lv[imgrep] lvimgrepa[dd] lw[indow] mak[e] ma[rk] marks mat[ch] menut[ranslate] mk[exrc] mks[ession] mksp[ell] mkvie[w] mkv[imrc] mod[e] m[ove] mzf[ile] mz[scheme] nbkey NetrwSettings new n[ext] N[ext] nmapc[lear] noh[lsearch] norea[bbrev] Nread nu[mber] nun[map] Nw omapc[lear] on[ly] o[pen] opt[ions] ou[nmap] pc[lose] ped[it] pe[rl] perld[o] po[p] popu popu[p] pp[op] pre[serve] prev[ious] p[rint] P[rint] profd[el] prof[ile] prompt promptf[ind] promptr[epl] ps[earch] pta[g] ptf[irst] ptj[ump] ptl[ast] ptn[ext] ptN[ext] ptp[revious] ptr[ewind] pts[elect] pu[t] pw[d] pyf[ile] py[thon] qa[ll] q[uit] quita[ll] r[ead] rec[over] redi[r] red[o] redr[aw] redraws[tatus] reg[isters] res[ize] ret[ab] retu[rn] rew[ind] ri[ght] rightb[elow] rub[y] rubyd[o] rubyf[ile] ru[ntime] rv[iminfo] sal[l] san[dbox] sa[rgument] sav[eas] sba[ll] sbf[irst] sbl[ast] sbm[odified] sbn[ext] sbN[ext] sbp[revious] sbr[ewind] sb[uffer] scripte[ncoding] scrip[tnames] se[t] setf[iletype] setg[lobal] setl[ocal] Sexplore sf[ind] sfir[st] sh[ell] sign sil[ent] sim[alt] sla[st] sl[eep] sm[agic] sn[ext] sN[ext] sni[ff] sno[magic] sor[t] so[urce] spelld[ump] spe[llgood] spellr[epall] spellw[rong] sp[lit] spr[evious] sre[wind] sta[g] startg[replace] star[tinsert] startr[eplace] stj[ump] st[op] stopi[nsert] sts[elect] sun[hide] sus[pend] sv[iew] syncbind t ta[g] tags tc[l] tcld[o] tclf[ile] te[aroff] tf[irst] the th[row] tj[ump] tl[ast] tm tm[enu] tn[ext] tN[ext] to[pleft] tp[revious] tr[ewind] try ts[elect] tu tu[nmenu] una[bbreviate] u[ndo] unh[ide] unlo[ckvar] unm[ap] up[date] verb[ose] ve[rsion] vert[ical] Vexplore v[global] vie[w] vim[grep] vimgrepa[dd] vi[sual] viu[sage] vmapc[lear] vne[w] vs[plit] vu[nmap] wa[ll] wh[ile] winc[md] windo winp[os] win[size] wn[ext] wN[ext] wp[revious] wq wqa[ll] w[rite] ws[verb] wv[iminfo] X xa[ll] x[it] XMLent XMLns y[ank]
	19	+syn keyword vimCommand contained ab[breviate] abc[lear] abo[veleft] al[l] arga[dd] argd[elete] argdo arge[dit] argg[lobal] argl[ocal] ar[gs] argu[ment] as[cii] bad[d] ba[ll] bd[elete] be bel[owright] bf[irst] bl[ast] bm[odified] bn[ext] bN[ext] bo[tright] bp[revious] brea[k] breaka[dd] breakd[el] breakl[ist] br[ewind] bro[wse] bufdo b[uffer] buffers bun[load] bw[ipeout] ca[bbrev] cabc[lear] caddb[uffer] cad[dexpr] caddf[ile] cal[l] cat[ch] cb[uffer] cc ccl[ose] cd ce[nter] cex[pr] cf[ile] cfir[st] cg[etfile] c[hange] changes chd[ir] che[ckpath] checkt[ime] cla[st] cl[ist] clo[se] cmapc[lear] cnew[er] cn[ext] cN[ext] cnf[ile] cNf[ile] cnorea[bbrev] col[der] colo[rscheme] comc[lear] comp[iler] conf[irm] con[tinue] cope[n] co[py] cpf[ile] cp[revious] cq[uit] cr[ewind] cuna[bbrev] cu[nmap] cw[indow] debugg[reedy] delc[ommand] d[elete] DeleteFirst delf[unction] delm[arks] diffg[et] diffoff diffpatch diffpu[t] diffsplit diffthis diffu[pdate] dig[raphs] di[splay] dj[ump] dl[ist] dr[op] ds[earch] dsp[lit] echoe[rr] echom[sg] echon e[dit] el[se] elsei[f] em[enu] emenu* endfo[r] endf[unction] en[dif] endt[ry] endw[hile] ene[w] ex exi[t] Explore exu[sage] f[ile] files filetype fina[lly] fin[d] fini[sh] fir[st] fix[del] fo[ld] foldc[lose] folddoc[losed] foldd[oopen] foldo[pen] for fu[nction] g[lobal] go[to] gr[ep] grepa[dd] ha[rdcopy] h[elp] helpf[ind] helpg[rep] helpt[ags] Hexplore hid[e] his[tory] I ia[bbrev] iabc[lear] if ij[ump] il[ist] imapc[lear] inorea[bbrev] is[earch] isp[lit] iuna[bbrev] iu[nmap] j[oin] ju[mps] k keepalt keepj[umps] kee[pmarks] laddb[uffer] lad[dexpr] laddf[ile] lan[guage] la[st] lb[uffer] lc[d] lch[dir] lcl[ose] le[ft] lefta[bove] lex[pr] lf[ile] lfir[st] lg[etfile] lgr[ep] lgrepa[dd] lh[elpgrep] l[ist] ll lla[st] lli[st] lmak[e] lm[ap] lmapc[lear] lnew[er] lne[xt] lN[ext] lnf[ile] lNf[ile] ln[oremap] lo[adview] loc[kmarks] lockv[ar] lol[der] lop[en] lpf[ile] lp[revious] lr[ewind] ls lt[ag] lu[nmap] lv[imgrep] lvimgrepa[dd] lw[indow] mak[e] ma[rk] marks mat[ch] menut[ranslate] mk[exrc] mks[ession] mksp[ell] mkvie[w] mkv[imrc] mod[e] m[ove] mzf[ile] mz[scheme] nbkey NetrwSettings new n[ext] N[ext] nmapc[lear] noh[lsearch] norea[bbrev] Nread nu[mber] nun[map] Nw omapc[lear] on[ly] o[pen] opt[ions] ou[nmap] pc[lose] ped[it] pe[rl] perld[o] po[p] popu popu[p] pp[op] pre[serve] prev[ious] p[rint] P[rint] profd[el] prof[ile] prompt promptf[ind] promptr[epl] ps[earch] pta[g] ptf[irst] ptj[ump] ptl[ast] ptn[ext] ptN[ext] ptp[revious] ptr[ewind] pts[elect] pu[t] pw[d] pyf[ile] py[thon] qa[ll] q[uit] quita[ll] r[ead] rec[over] redi[r] red[o] redr[aw] redraws[tatus] reg[isters] res[ize] ret[ab] retu[rn] rew[ind] ri[ght] rightb[elow] rub[y] rubyd[o] rubyf[ile] ru[ntime] rv[iminfo] sal[l] san[dbox] sa[rgument] sav[eas] sba[ll] sbf[irst] sbl[ast] sbm[odified] sbn[ext] sbN[ext] sbp[revious] sbr[ewind] sb[uffer] scripte[ncoding] scrip[tnames] se[t] setf[iletype] setg[lobal] setl[ocal] Sexplore sf[ind] sfir[st] sh[ell] sign sil[ent] sim[alt] sla[st] sl[eep] sm[agic] sn[ext] sN[ext] sni[ff] sno[magic] sor[t] so[urce] spelld[ump] spe[llgood] spellr[epall] spellw[rong] sp[lit] spr[evious] sre[wind] sta[g] startg[replace] star[tinsert] startr[eplace] stj[ump] st[op] stopi[nsert] sts[elect] sun[hide] sus[pend] sv[iew] syncbind t ta[g] tags tc[l] tcld[o] tclf[ile] te[aroff] tf[irst] the th[row] tj[ump] tl[ast] tm tm[enu] tn[ext] tN[ext] to[pleft] tp[revious] tr[ewind] try ts[elect] tu tu[nmenu] una[bbreviate] u[ndo] unh[ide] unlo[ckvar] unm[ap] up[date] verb[ose] ve[rsion] vert[ical] Vexplore v[global] vie[w] vim[grep] vimgrepa[dd] vi[sual] viu[sage] vmapc[lear] vne[w] vs[plit] vu[nmap] wa[ll] wh[ile] winc[md] windo winp[os] win[size] wn[ext] wN[ext] wp[revious] wq wqa[ll] w[rite] ws[verb] wv[iminfo] X xa[ll] x[it] XMLent XMLns y[ank]
20	20	syn match vimCommand contained "\<z[-+^.=]"
21	21
22	22	" vimOptions are caught only when contained in a vimSet {{{2
23		-syn keyword vimOption contained : acd ai akm al aleph allowrevins altkeymap ambiwidth ambw anti antialias ar arab arabic arabicshape ari arshape autochdir autoindent autoread autowrite autowriteall aw awa background backspace backup backupcopy backupdir backupext backupskip balloondelay ballooneval balloonexpr bdir bdlay beval bex bexpr bg bh bin binary biosk bioskey bk bkc bl bomb breakat brk browsedir bs bsdir bsk bt bufhidden buflisted buftype casemap cb ccv cd cdpath cedit cf cfu ch charconvert ci cin cindent cink cinkeys cino cinoptions cinw cinwords clipboard cmdheight cmdwinheight cmp cms co columns com comments commentstring compatible complete completefunc completeopt confirm consk conskey copyindent cot cp cpo cpoptions cpt cscopepathcomp cscopeprg cscopequickfix cscopetag cscopetagorder cscopeverbose cspc csprg csqf cst csto csverb cwh debug deco def define delcombine dex dg dict dictionary diff diffexpr diffopt digraph dip dir directory display dy ea ead eadirection eb ed edcompatible ef efm ei ek enc encoding endofline eol ep equalalways equalprg errorbells errorfile errorformat esckeys et eventignore ex expandtab exrc fcl fcs fdc fde fdi fdl fdls fdm fdn fdo fdt fen fenc fencs ff ffs fileencoding fileencodings fileformat fileformats filetype fillchars fk fkmap flp fml fmr fo foldclose foldcolumn foldenable foldexpr foldignore foldlevel foldlevelstart foldmarker foldmethod foldminlines foldnestmax foldopen foldtext formatlistpat formatoptions formatprg fp fs fsync ft gcr gd gdefault gfm gfn gfs gfw ghr go gp grepformat grepprg guicursor guifont guifontset guifontwide guiheadroom guioptions guipty helpfile helpheight helplang hf hh hi hid hidden highlight history hk hkmap hkmapp hkp hl hlg hls hlsearch ic icon iconstring ignorecase im imactivatekey imak imc imcmdline imd imdisable imi iminsert ims imsearch inc include includeexpr incsearch inde indentexpr indentkeys indk inex inf infercase insertmode is isf isfname isi isident isk iskeyword isp isprint joinspaces js key keymap keymodel keywordprg km kmp kp langmap langmenu laststatus lazyredraw lbr lcs linebreak lines linespace lisp lispwords list listchars lm lmap loadplugins lpl ls lsp lw lz ma magic makeef makeprg mat matchpairs matchtime maxfuncdepth maxmapdepth maxmem maxmempattern maxmemtot mef menuitems mfd mh mis mkspellmem ml mls mm mmd mmp mmt mod modeline modelines modifiable modified more mouse mousef mousefocus mousehide mousem mousemodel mouses mouseshape mouset mousetime mp mps msm mzq mzquantum nf nrformats nu number numberwidth nuw oft ofu omnifunc operatorfunc opfunc osfiletype pa para paragraphs paste pastetoggle patchexpr patchmode path pdev penc pex pexpr pfn pheader pi pm pmbcs pmbfn popt preserveindent previewheight previewwindow printdevice printencoding printexpr printfont printheader printmbcharset printmbfont printoptions prompt pt pvh pvw qe quoteescape readonly remap report restorescreen revins ri rightleft rightleftcmd rl rlc ro rs rtp ru ruf ruler rulerformat runtimepath sb sbo sbr sc scb scr scroll scrollbind scrolljump scrolloff scrollopt scs sect sections secure sel selection selectmode sessionoptions sft sh shcf shell shellcmdflag shellpipe shellquote shellredir shellslash shelltemp shelltype shellxquote shiftround shiftwidth shm shortmess shortname showbreak showcmd showfulltag showmatch showmode shq si sidescroll sidescrolloff siso sj slm sm smartcase smartindent smarttab smc smd sn so softtabstop sol sp spc spell spellcapcheck spellfile spelllang spellsuggest spf spl splitbelow splitright spr sps sr srr ss ssl ssop st sta startofline statusline stl stmp sts su sua suffixes suffixesadd sw swapfile swapsync swb swf switchbuf sws sxq syn synmaxcol syntax ta tabstop tag tagbsearch taglength tagrelative tags tagstack tb tbi tbidi tbis tbs tenc term termbidi termencoding terse textauto textmode textwidth tf tgst thesaurus tildeop timeout timeoutlen title titlelen titleold titlestring tl tm to toolbar toolbariconsize top tr ts tsl tsr ttimeout ttimeoutlen ttm tty ttybuiltin ttyfast ttym ttymouse ttyscroll ttytype tw tx uc ul undolevels updatecount updatetime ut vb vbs vdir ve verbose verbosefile vfile vi viewdir viewoptions viminfo virtualedit visualbell vop wa wak warn wb wc wcm wd weirdinvert wfh wh whichwrap wi wig wildchar wildcharm wildignore wildmenu wildmode wildoptions wim winaltkeys window winfixheight winheight winminheight winminwidth winwidth wiv wiw wm wmh wmnu wmw wop wrap wrapmargin wrapscan write writeany writebackup writedelay ws ww
	23	+syn keyword vimOption contained : acd ai akm al aleph allowrevins altkeymap ambiwidth ambw anti antialias ar arab arabic arabicshape ari arshape autochdir autoindent autoread autowrite autowriteall aw awa background backspace backup backupcopy backupdir backupext backupskip balloondelay ballooneval balloonexpr bdir bdlay beval bex bexpr bg bh bin binary biosk bioskey bk bkc bl bomb breakat brk browsedir bs bsdir bsk bt bufhidden buflisted buftype casemap cb ccv cd cdpath cedit cf cfu ch charconvert ci cin cindent cink cinkeys cino cinoptions cinw cinwords clipboard cmdheight cmdwinheight cmp cms co columns com comments commentstring compatible complete completefunc completeopt confirm consk conskey copyindent cot cp cpo cpoptions cpt cscopepathcomp cscopeprg cscopequickfix cscopetag cscopetagorder cscopeverbose cspc csprg csqf cst csto csverb cwh debug deco def define delcombine dex dg dict dictionary diff diffexpr diffopt digraph dip dir directory display dy ea ead eadirection eb ed edcompatible ef efm ei ek enc encoding endofline eol ep equalalways equalprg errorbells errorfile errorformat esckeys et eventignore ex expandtab exrc fcl fcs fdc fde fdi fdl fdls fdm fdn fdo fdt fen fenc fencs fex ff ffs fileencoding fileencodings fileformat fileformats filetype fillchars fk fkmap flp fml fmr fo foldclose foldcolumn foldenable foldexpr foldignore foldlevel foldlevelstart foldmarker foldmethod foldminlines foldnestmax foldopen foldtext formatexpr formatlistpat formatoptions formatprg fp fs fsync ft gcr gd gdefault gfm gfn gfs gfw ghr go gp grepformat grepprg guicursor guifont guifontset guifontwide guiheadroom guioptions guipty helpfile helpheight helplang hf hh hi hid hidden highlight history hk hkmap hkmapp hkp hl hlg hls hlsearch ic icon iconstring ignorecase im imactivatekey imak imc imcmdline imd imdisable imi iminsert ims imsearch inc include includeexpr incsearch inde indentexpr indentkeys indk inex inf infercase insertmode is isf isfname isi isident isk iskeyword isp isprint joinspaces js key keymap keymodel keywordprg km kmp kp langmap langmenu laststatus lazyredraw lbr lcs linebreak lines linespace lisp lispwords list listchars lm lmap loadplugins lpl ls lsp lw lz ma magic makeef makeprg mat matchpairs matchtime maxfuncdepth maxmapdepth maxmem maxmempattern maxmemtot mef menuitems mfd mh mis mkspellmem ml mls mm mmd mmp mmt mod modeline modelines modifiable modified more mouse mousef mousefocus mousehide mousem mousemodel mouses mouseshape mouset mousetime mp mps msm mzq mzquantum nf nrformats nu number numberwidth nuw oft ofu omnifunc operatorfunc opfunc osfiletype pa para paragraphs paste pastetoggle patchexpr patchmode path pdev penc pex pexpr pfn pheader pi pm pmbcs pmbfn popt preserveindent previewheight previewwindow printdevice printencoding printexpr printfont printheader printmbcharset printmbfont printoptions prompt pt pvh pvw qe quoteescape readonly remap report restorescreen revins ri rightleft rightleftcmd rl rlc ro rs rtp ru ruf ruler rulerformat runtimepath sb sbo sbr sc scb scr scroll scrollbind scrolljump scrolloff scrollopt scs sect sections secure sel selection selectmode sessionoptions sft sh shcf shell shellcmdflag shellpipe shellquote shellredir shellslash shelltemp shelltype shellxquote shiftround shiftwidth shm shortmess shortname showbreak showcmd showfulltag showmatch showmode shq si sidescroll sidescrolloff siso sj slm sm smartcase smartindent smarttab smc smd sn so softtabstop sol sp spc spell spellcapcheck spellfile spelllang spellsuggest spf spl splitbelow splitright spr sps sr srr ss ssl ssop st sta startofline statusline stl stmp sts su sua suffixes suffixesadd sw swapfile swapsync swb swf switchbuf sws sxq syn synmaxcol syntax ta tabstop tag tagbsearch taglength tagrelative tags tagstack tb tbi tbidi tbis tbs tenc term termbidi termencoding terse textauto textmode textwidth tf tgst thesaurus tildeop timeout timeoutlen title titlelen titleold titlestring tl tm to toolbar toolbariconsize top tr ts tsl tsr ttimeout ttimeoutlen ttm tty ttybuiltin ttyfast ttym ttymouse ttyscroll ttytype tw tx uc ul undolevels updatecount updatetime ut vb vbs vdir ve verbose verbosefile vfile vi viewdir viewoptions viminfo virtualedit visualbell vop wa wak warn wb wc wcm wd weirdinvert wfh wh whichwrap wi wig wildchar wildcharm wildignore wildmenu wildmode wildoptions wim winaltkeys window winfixheight winheight winminheight winminwidth winwidth wiv wiw wm wmh wmnu wmw wop wrap wrapmargin wrapscan write writeany writebackup writedelay ws ww
24	24
25	25	" vimOptions: These are the turn-off setting variants {{{2
26	26	syn keyword vimOption contained noacd noai noakm noallowrevins noaltkeymap noanti noantialias noar noarab noarabic noarabicshape noari noarshape noautochdir noautoindent noautoread noautowrite noautowriteall noaw noawa nobackup noballooneval nobeval nobin nobinary nobiosk nobioskey nobk nobl nobomb nobuflisted nocf noci nocin nocindent nocompatible noconfirm noconsk noconskey nocopyindent nocp nocscopetag nocscopeverbose nocst nocsverb nodeco nodelcombine nodg nodiff nodigraph nodisable noea noeb noed noedcompatible noek noendofline noeol noequalalways noerrorbells noesckeys noet noex noexpandtab noexrc nofen nofk nofkmap nofoldenable nogd nogdefault noguipty nohid nohidden nohk nohkmap nohkmapp nohkp nohls nohlsearch noic noicon noignorecase noim noimc noimcmdline noimd noincsearch noinf noinfercase noinsertmode nois nojoinspaces nojs nolazyredraw nolbr nolinebreak nolisp nolist noloadplugins nolpl nolz noma nomagic nomh noml nomod nomodeline nomodifiable nomodified nomore nomousef nomousefocus nomousehide nonu nonumber nopaste nopi nopreserveindent nopreviewwindow noprompt nopvw noreadonly noremap norestorescreen norevins nori norightleft norightleftcmd norl norlc noro nors noru noruler nosb nosc noscb noscrollbind noscs nosecure nosft noshellslash noshelltemp noshiftround noshortname noshowcmd noshowfulltag noshowmatch noshowmode nosi nosm nosmartcase nosmartindent nosmarttab nosmd nosn nosol nospell nosplitbelow nosplitright nospr nosr nossl nosta nostartofline nostmp noswapfile noswf nota notagbsearch notagrelative notagstack notbi notbidi notbs notermbidi noterse notextauto notextmode notf notgst notildeop notimeout notitle noto notop notr nottimeout nottybuiltin nottyfast notx novb novisualbell nowa nowarn nowb noweirdinvert nowfh nowildmenu nowinfixheight nowiv nowmnu nowrap nowrapscan nowrite nowriteany nowritebackup nows

		@@ -44,7 +44,7 @@
44	44
45	45	" AutoBuf Events {{{2
46	46	syn case ignore
47		-syn keyword vimAutoEvent contained BufAdd BufCreate BufDelete BufEnter BufFilePost BufFilePre BufHidden BufLeave BufNew BufNewFile BufRead BufReadCmd BufReadPost BufReadPre BufUnload BufWinEnter BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre Cmd-event CmdwinEnter CmdwinLeave ColorScheme CursorHold E135 E143 E200 E201 E203 E204 EncodingChanged FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter InsertChange InsertEnter InsertLeave MenuPopup QuickFixCmdPost QuickFixCmdPre RemoteReply SessionLoadPost SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TermChanged TermResponse User UserGettingBored VimEnter VimLeave VimLeavePre WinEnter WinLeave
	47	+syn keyword vimAutoEvent contained BufAdd BufCreate BufDelete BufEnter BufFilePost BufFilePre BufHidden BufLeave BufNew BufNewFile BufRead BufReadCmd BufReadPost BufReadPre BufUnload BufWinEnter BufWinLeave BufWipeout BufWrite BufWriteCmd BufWritePost BufWritePre Cmd-event CmdwinEnter CmdwinLeave ColorScheme CursorHold CursorHoldI CursorMoved CursorMovedI E135 E143 E200 E201 E203 E204 EncodingChanged FileAppendCmd FileAppendPost FileAppendPre FileChangedRO FileChangedShell FileEncoding FileReadCmd FileReadPost FileReadPre FileType FileWriteCmd FileWritePost FileWritePre FilterReadPost FilterReadPre FilterWritePost FilterWritePre FocusGained FocusLost FuncUndefined GUIEnter InsertChange InsertEnter InsertLeave MenuPopup QuickFixCmdPost QuickFixCmdPre RemoteReply SessionLoadPost SpellFileMissing StdinReadPost StdinReadPre SwapExists Syntax TermChanged TermResponse User UserGettingBored VimEnter VimLeave VimLeavePre WinEnter WinLeave
48	48
49	49	" Highlight commonly used Groupnames {{{2
50	50	syn keyword vimGroup contained Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo

		@@ -55,7 +55,7 @@
55	55	syn case match
56	56
57	57	" Function Names {{{2
58		-syn keyword vimFuncName contained add append argc argidx argv browse browsedir bufexists buflisted bufloaded bufname bufnr bufwinnr byte2line byteidx call char2nr cindent col complete_add complete_check confirm copy count cscope_connection cursor deepcopy delete did_filetype diff_filler diff_hlID empty escape eval eventhandler executable exists expand expr8 extend filereadable filewritable filter finddir findfile fnamemodify foldclosed foldclosedend foldlevel foldtext foldtextresult foreground function garbagecollect get getbufline getbufvar getchar getcharmod getcmdline getcmdpos getcmdtype getcwd getfontname getfperm getfsize getftime getftype getline getloclist getqflist getreg getregtype getwinposx getwinposy getwinvar glob globpath has has_key hasmapto histadd histdel histget histnr hlexists hlID hostname iconv indent index input inputdialog inputlist inputrestore inputsave inputsecret insert isdirectory islocked items join keys len libcall libcallnr line line2byte lispindent localtime map maparg mapcheck match matchend matchlist matchstr max min mkdir mode nextnonblank nr2char prevnonblank printf range readfile remote_expr remote_foreground remote_peek remote_read remote_send remove rename repeat resolve reverse search searchdecl searchpair server2client serverlist setbufvar setcmdpos setline setloclist setqflist setreg setwinvar simplify sort soundfold spellbadword spellsuggest split strftime stridx string strlen strpart strridx strtrans submatch substitute synID synIDattr synIDtrans system tagfiles taglist tempname tolower toupper tr type values virtcol visualmode winbufnr wincol winheight winline winnr winrestcmd winwidth writefile
	58	+syn keyword vimFuncName contained add append argc argidx argv browse browsedir bufexists buflisted bufloaded bufname bufnr bufwinnr byte2line byteidx call char2nr cindent col complete_add complete_check confirm copy count cscope_connection cursor deepcopy delete did_filetype diff_filler diff_hlID empty escape eval eventhandler executable exists expand expr8 extend filereadable filewritable filter finddir findfile fnamemodify foldclosed foldclosedend foldlevel foldtext foldtextresult foreground function garbagecollect get getbufline getbufvar getchar getcharmod getcmdline getcmdpos getcmdtype getcwd getfontname getfperm getfsize getftime getftype getline getloclist getqflist getreg getregtype getwinposx getwinposy getwinvar glob globpath has has_key hasmapto histadd histdel histget histnr hlexists hlID hostname iconv indent index input inputdialog inputlist inputrestore inputsave inputsecret insert isdirectory islocked items join keys len libcall libcallnr line line2byte lispindent localtime map maparg mapcheck match matchend matchlist matchstr max min mkdir mode nextnonblank nr2char prevnonblank printf pumvisible range readfile remote_expr remote_foreground remote_peek remote_read remote_send remove rename repeat resolve reverse search searchdecl searchpair searchpairpos searchpos server2client serverlist setbufvar setcmdpos setline setloclist setqflist setreg setwinvar simplify sort soundfold spellbadword spellsuggest split strftime stridx string strlen strpart strridx strtrans submatch substitute synID synIDattr synIDtrans system tagfiles taglist tempname tolower toupper tr type values virtcol visualmode winbufnr wincol winheight winline winnr winrestcmd winwidth writefile
59	59
60	60	"--- syntax above generated by mkvimvim ---
61	61	" Special Vim Highlighting (not automatic) {{{1

diff -r f892bda292a8 -r 83a006f81bac src/auto/configure

--- a/src/auto/configure Wed Feb 15 22:18:42 2006 +0000

+++ b/src/auto/configure Thu Feb 16 22:11:02 2006 +0000

		@@ -15088,7 +15088,7 @@
15088	15088	DEPEND_CFLAGS_FILTER=
15089	15089	if test "$GCC" = yes; then
15090	15090	gccmajor=`"$CC" --version \| sed -e '2,$d;s/^[^0-9]$[1-9]$\.[0-9.].*$/\1/g'`
15091		- if test "$gccmajor" > "2"; then
	15091	+ if test "$gccmajor" -gt "2"; then
15092	15092	DEPEND_CFLAGS_FILTER="\| sed 's+-I */+-isystem /+g'"
15093	15093	fi
15094	15094	fi

diff -r f892bda292a8 -r 83a006f81bac src/buffer.c

--- a/src/buffer.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/buffer.c Thu Feb 16 22:11:02 2006 +0000

		@@ -1062,21 +1062,7 @@
1062	1062
1063	1063	/* Close any other windows on this buffer, then make it empty. */
1064	1064	#ifdef FEAT_WINDOWS
1065		- {
1066		- win_T wp, nextwp;
1067		-
1068		- for (wp = firstwin; wp != NULL; wp = nextwp)
1069		- {
1070		- nextwp = wp->w_next;
1071		- if (wp != curwin && wp->w_buffer == buf)
1072		- {
1073		- /* Start all over, autocommands may change the window
1074		- * layout. */
1075		- nextwp = firstwin;
1076		- win_close(wp, FALSE);
1077		- }
1078		- }
1079		- }
	1065	+ close_windows(buf, TRUE);
1080	1066	#endif
1081	1067	setpcmark();
1082	1068	retval = do_ecmd(0, NULL, NULL, NULL, ECMD_ONE,

		@@ -1095,9 +1081,11 @@
1095	1081	#ifdef FEAT_WINDOWS
1096	1082	/*
1097	1083	* If the deleted buffer is the current one, close the current window
1098		- * (unless it's the only window).
	1084	+ * (unless it's the only window). Repeat this so long as we end up in
	1085	+ * a window with this buffer.
1099	1086	*/
1100		- while (buf == curbuf && firstwin != lastwin)
	1087	+ while (buf == curbuf
	1088	+ && (firstwin != lastwin \|\| first_tabpage->tp_next != NULL))
1101	1089	win_close(curwin, FALSE);
1102	1090	#endif
1103	1091

		@@ -1107,7 +1095,7 @@
1107	1095	if (buf != curbuf)
1108	1096	{
1109	1097	#ifdef FEAT_WINDOWS
1110		- close_windows(buf);
	1098	+ close_windows(buf, FALSE);
1111	1099	#endif
1112	1100	if (buf != curbuf && buf_valid(buf) && buf->b_nwindows <= 0)
1113	1101	close_buffer(NULL, buf, action);

		@@ -1317,7 +1305,7 @@
1317	1305	{
1318	1306	#ifdef FEAT_WINDOWS
1319	1307	if (unload)
1320		- close_windows(prevbuf);
	1308	+ close_windows(prevbuf, FALSE);
1321	1309	#endif
1322	1310	#if defined(FEAT_AUTOCMD) && defined(FEAT_EVAL)
1323	1311	if (buf_valid(prevbuf) && !aborting())

		@@ -4707,6 +4695,7 @@
4707	4695	buf_T *buf;
4708	4696	#ifdef FEAT_WINDOWS
4709	4697	win_T *win;
	4698	+ tabpage_T *tp;
4710	4699	#endif
4711	4700	char_u *line;
4712	4701	int max_buffers;

		@@ -4723,7 +4712,7 @@
4723	4712	return;
4724	4713
4725	4714	#ifdef FEAT_WINDOWS
4726		- for (win = firstwin; win != NULL; win = win->w_next)
	4715	+ FOR_ALL_TAB_WINDOWS(tp, win)
4727	4716	set_last_cursor(win);
4728	4717	#else
4729	4718	set_last_cursor(curwin);

diff -r f892bda292a8 -r 83a006f81bac src/configure.in

--- a/src/configure.in Wed Feb 15 22:18:42 2006 +0000

+++ b/src/configure.in Thu Feb 16 22:11:02 2006 +0000

		@@ -2761,7 +2761,7 @@
2761	2761	DEPEND_CFLAGS_FILTER=
2762	2762	if test "$GCC" = yes; then
2763	2763	gccmajor=`"$CC" --version \| sed -e '2,$d;s/^[[^0-9]]$[[1-9]]$\.[[0-9.]].*$/\1/g'`
2764		- if test "$gccmajor" > "2"; then
	2764	+ if test "$gccmajor" -gt "2"; then
2765	2765	DEPEND_CFLAGS_FILTER="\| sed 's+-I */+-isystem /+g'"
2766	2766	fi
2767	2767	fi

diff -r f892bda292a8 -r 83a006f81bac src/diff.c

--- a/src/diff.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/diff.c Thu Feb 16 22:11:02 2006 +0000

		@@ -1075,6 +1075,7 @@
1075	1075
1076	1076	/*
1077	1077	* Set options not to show diffs. For the current window or all windows.
	1078	+ * Only in the current tab page.
1078	1079	*/
1079	1080	void
1080	1081	ex_diffoff(eap)

diff -r f892bda292a8 -r 83a006f81bac src/eval.c

--- a/src/eval.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/eval.c Thu Feb 16 22:11:02 2006 +0000

		@@ -15509,11 +15509,13 @@
15509	15509	pos.col = 0;
15510	15510	if (name[1] == '0') /* "w0": first visible line */
15511	15511	{
	15512	+ update_topline();
15512	15513	pos.lnum = curwin->w_topline;
15513	15514	return &pos;
15514	15515	}
15515	15516	else if (name[1] == '$') /* "w$": last visible line */
15516	15517	{
	15518	+ validate_botline();
15517	15519	pos.lnum = curwin->w_botline - 1;
15518	15520	return &pos;
15519	15521	}

diff -r f892bda292a8 -r 83a006f81bac src/ex_cmds2.c

--- a/src/ex_cmds2.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/ex_cmds2.c Thu Feb 16 22:11:02 2006 +0000

		@@ -1761,8 +1761,9 @@
1761	1761	{
1762	1762	#ifdef FEAT_WINDOWS
1763	1763	win_T *win;
1764		-
1765		- for (win = firstwin; win != NULL; win = win->w_next)
	1764	+ tabpage_T *tp;
	1765	+
	1766	+ FOR_ALL_TAB_WINDOWS(tp, win)
1766	1767	if (win->w_alist == curwin->w_alist)
1767	1768	check_arg_idx(win);
1768	1769	#else

diff -r f892bda292a8 -r 83a006f81bac src/ex_docmd.c

--- a/src/ex_docmd.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/ex_docmd.c Thu Feb 16 22:11:02 2006 +0000

		@@ -148,7 +148,7 @@
148	148	static void ex_quit_all __ARGS((exarg_T *eap));
149	149	#ifdef FEAT_WINDOWS
150	150	static void ex_close __ARGS((exarg_T *eap));
151		-static void ex_win_close __ARGS((int forceit, win_T *win));
	151	+static void ex_win_close __ARGS((int forceit, win_T win, tabpage_T tp));
152	152	static void ex_only __ARGS((exarg_T *eap));
153	153	static void ex_all __ARGS((exarg_T *eap));
154	154	static void ex_resize __ARGS((exarg_T *eap));

		@@ -6144,7 +6144,7 @@
6144	6144	else
6145	6145	# endif
6146	6146	if (!text_locked())
6147		- ex_win_close(eap->forceit, curwin);
	6147	+ ex_win_close(eap->forceit, curwin, NULL);
6148	6148	}
6149	6149
6150	6150	#ifdef FEAT_QUICKFIX

		@@ -6160,16 +6160,21 @@
6160	6160	for (win = firstwin; win != NULL; win = win->w_next)
6161	6161	if (win->w_p_pvw)
6162	6162	{
6163		- ex_win_close(eap->forceit, win);
	6163	+ ex_win_close(eap->forceit, win, NULL);
6164	6164	break;
6165	6165	}
6166	6166	}
6167	6167	#endif
6168	6168
6169		- static void
6170		-ex_win_close(forceit, win)
	6169	+/*
	6170	+ * Close window "win" and take care of handling closing the last window for a
	6171	+ * modified buffer.
	6172	+ */
	6173	+ static void
	6174	+ex_win_close(forceit, win, tp)
6171	6175	int forceit;
6172	6176	win_T *win;
	6177	+ tabpage_T tp; / NULL or the tab page "win" is in */
6173	6178	{
6174	6179	int need_hide;
6175	6180	buf_T *buf = win->w_buffer;

		@@ -6196,36 +6201,90 @@
6196	6201	#ifdef FEAT_GUI
6197	6202	need_mouse_correct = TRUE;
6198	6203	#endif
	6204	+
6199	6205	/* free buffer when not hiding it or when it's a scratch buffer */
6200		- win_close(win, !need_hide && !P_HID(buf));
6201		-}
6202		-
6203		-/*
6204		- * ":tabclose": close current tab page, unless it is the last one
	6206	+ if (tp == NULL)
	6207	+ win_close(win, !need_hide && !P_HID(buf));
	6208	+ else
	6209	+ win_close_othertab(win, !need_hide && !P_HID(buf), tp);
	6210	+}
	6211	+
	6212	+/*
	6213	+ * ":tabclose": close current tab page, unless it is the last one.
	6214	+ * ":tabclose N": close tab page N.
6205	6215	*/
6206	6216	static void
6207	6217	ex_tabclose(eap)
6208	6218	exarg_T *eap;
6209	6219	{
	6220	+ tabpage_T *tp;
	6221	+
6210	6222	# ifdef FEAT_CMDWIN
6211	6223	if (cmdwin_type != 0)
6212	6224	cmdwin_result = K_IGNORE;
6213	6225	else
6214	6226	# endif
6215		- if (!text_locked())
6216		- {
6217		- if (first_tabpage->tp_next == NULL)
6218		- EMSG(_("E999: Cannot close last tab page"));
6219		- else
6220		- {
6221		- /* First close all the windows but the current one. If that
6222		- * worked then close the last window in this tab, that will
6223		- * close it. */
6224		- ex_only(eap);
6225		- if (lastwin == firstwin)
6226		- ex_win_close(eap->forceit, curwin);
6227		- }
6228		- }
	6227	+ if (first_tabpage->tp_next == NULL)
	6228	+ EMSG(_("E999: Cannot close last tab page"));
	6229	+ else
	6230	+ {
	6231	+ if (eap->addr_count > 0)
	6232	+ {
	6233	+ tp = find_tabpage((int)eap->line2);
	6234	+ if (tp == NULL)
	6235	+ {
	6236	+ beep_flush();
	6237	+ return;
	6238	+ }
	6239	+ if (tp->tp_topframe != topframe)
	6240	+ {
	6241	+ tabpage_close_other(tp, eap->forceit);
	6242	+ return;
	6243	+ }
	6244	+ }
	6245	+ if (!text_locked())
	6246	+ tabpage_close(eap->forceit);
	6247	+ }
	6248	+}
	6249	+
	6250	+/*
	6251	+ * Close the current tab page.
	6252	+ */
	6253	+ void
	6254	+tabpage_close(forceit)
	6255	+ int forceit;
	6256	+{
	6257	+ /* First close all the windows but the current one. If that worked then
	6258	+ * close the last window in this tab, that will close it. */
	6259	+ close_others(TRUE, forceit);
	6260	+ if (lastwin == firstwin)
	6261	+ ex_win_close(forceit, curwin, NULL);
	6262	+# ifdef FEAT_GUI
	6263	+ need_mouse_correct = TRUE;
	6264	+# endif
	6265	+}
	6266	+
	6267	+/*
	6268	+ * Close tab page "tp", which is not the current tab page.
	6269	+ * Note that autocommands may make "tp" invalid.
	6270	+ */
	6271	+ void
	6272	+tabpage_close_other(tp, forceit)
	6273	+ tabpage_T *tp;
	6274	+ int forceit;
	6275	+{
	6276	+ int done = 0;
	6277	+
	6278	+ /* Limit to 1000 windows, autocommands may add a window while we close
	6279	+ * one. OK, so I'm paranoid... */
	6280	+ while (++done < 1000)
	6281	+ {
	6282	+ ex_win_close(forceit, tp->tp_firstwin, tp);
	6283	+
	6284	+ /* Autocommands may delete the tab page under our fingers. */
	6285	+ if (!valid_tabpage(tp))
	6286	+ break;
	6287	+ }
6229	6288	}
6230	6289
6231	6290	/*

		@@ -6689,13 +6748,14 @@
6689	6748	int i;
6690	6749	# ifdef FEAT_WINDOWS
6691	6750	win_T *wp;
	6751	+ tabpage_T *tp;
6692	6752	# endif
6693	6753
6694	6754	for (i = 0; i < GARGCOUNT; ++i)
6695	6755	if (GARGLIST[i].ae_fname != NULL)
6696	6756	slash_adjust(GARGLIST[i].ae_fname);
6697	6757	# ifdef FEAT_WINDOWS
6698		- for (wp = firstwin; wp != NULL; wp = wp->w_next)
	6758	+ FOR_ALL_TAB_WINDOWS(tp, wp)
6699	6759	if (wp->w_alist != &global_alist)
6700	6760	for (i = 0; i < WARGCOUNT(wp); ++i)
6701	6761	if (WARGLIST(wp)[i].ae_fname != NULL)

		@@ -6925,7 +6985,8 @@
6925	6985	# ifdef FEAT_SCROLLBIND
6926	6986	curwin->w_p_scb = FALSE;
6927	6987	# endif
6928		- do_exedit(eap, NULL);
	6988	+ if (*eap->arg != NUL)
	6989	+ do_exedit(eap, NULL);
6929	6990	}
6930	6991
6931	6992	# ifdef FEAT_BROWSE

diff -r f892bda292a8 -r 83a006f81bac src/globals.h

--- a/src/globals.h Wed Feb 15 22:18:42 2006 +0000

+++ b/src/globals.h Thu Feb 16 22:11:02 2006 +0000

		@@ -42,7 +42,7 @@
42	42	EXTERN schar_T *ScreenLines INIT(= NULL);
43	43	EXTERN sattr_T *ScreenAttrs INIT(= NULL);
44	44	EXTERN unsigned *LineOffset INIT(= NULL);
45		-EXTERN char_u *LineWraps INIT(= NULL);
	45	+EXTERN char_u LineWraps INIT(= NULL); / line wraps to next line */
46	46
47	47	#ifdef FEAT_MBYTE
48	48	/*

		@@ -61,6 +61,10 @@
61	61	EXTERN schar_T *ScreenLines2 INIT(= NULL);
62	62	#endif
63	63
	64	+#ifdef FEAT_WINDOWS
	65	+EXTERN char_u TabPageIdxs INIT(= NULL); / indexes for tab page line */
	66	+#endif
	67	+
64	68	EXTERN int screen_Rows INIT(= 0); /* actual size of ScreenLines[] */
65	69	EXTERN int screen_Columns INIT(= 0); /* actual size of ScreenLines[] */
66	70

		@@ -482,6 +486,10 @@
482	486	EXTERN win_T prevwin INIT(= NULL); / previous window */
483	487	# define W_NEXT(wp) ((wp)->w_next)
484	488	# define FOR_ALL_WINDOWS(wp) for (wp = firstwin; wp != NULL; wp = wp->w_next)
	489	+#define FOR_ALL_TAB_WINDOWS(tp, wp) \
	490	+ for ((tp) = first_tabpage; (tp) != NULL; (tp) = (tp)->tp_next) \
	491	+ for ((wp) = ((tp)->tp_topframe == topframe) \
	492	+ ? firstwin : (tp)->tp_firstwin; (wp); (wp) = (wp)->w_next)
485	493	#else
486	494	# define firstwin curwin
487	495	# define lastwin curwin

diff -r f892bda292a8 -r 83a006f81bac src/if_mzsch.c

--- a/src/if_mzsch.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/if_mzsch.c Thu Feb 16 22:11:02 2006 +0000

		@@ -1423,7 +1423,8 @@
1423	1423	win_T *w;
1424	1424	int n = 0;
1425	1425
1426		- for (w = firstwin; w; w = w->w_next) ++n;
	1426	+ for (w = firstwin; w != NULL; w = w->w_next)
	1427	+ ++n;
1427	1428	return scheme_make_integer(n);
1428	1429	}
1429	1430

		@@ -1439,7 +1440,7 @@
1439	1440	buf = get_buffer_arg(prim->name, 0, argc, argv);
1440	1441	list = scheme_null;
1441	1442
1442		- for (w = firstwin; w; w = w->w_next)
	1443	+ for (w = firstwin; w != NULL; w = w->w_next)
1443	1444	if (w->w_buffer == buf->buf)
1444	1445	list = scheme_make_pair(window_new(w), list);
1445	1446

		@@ -1500,7 +1501,7 @@
1500	1501	if (fnum < 1)
1501	1502	scheme_signal_error(_("window index is out of range"));
1502	1503
1503		- for (win = firstwin; win; win = win->w_next, --fnum)
	1504	+ for (win = firstwin; win != NULL; win = win->w_next, --fnum)
1504	1505	if (fnum == 1) /* to be 1-based */
1505	1506	return window_new(win);
1506	1507

diff -r f892bda292a8 -r 83a006f81bac src/if_python.c

--- a/src/if_python.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/if_python.c Thu Feb 16 22:11:02 2006 +0000

		@@ -2160,7 +2160,7 @@
2160	2160	win_T *w = firstwin;
2161	2161	int n = 0;
2162	2162
2163		- while (w)
	2163	+ while (w != NULL)
2164	2164	{
2165	2165	++n;
2166	2166	w = W_NEXT(w);

		@@ -2175,7 +2175,7 @@
2175	2175	{
2176	2176	win_T *w;
2177	2177
2178		- for (w = firstwin; w; w = W_NEXT(w), --n)
	2178	+ for (w = firstwin; w != NULL; w = W_NEXT(w), --n)
2179	2179	if (n == 0)
2180	2180	return WindowNew(w);
2181	2181

diff -r f892bda292a8 -r 83a006f81bac src/if_ruby.c

--- a/src/if_ruby.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/if_ruby.c Thu Feb 16 22:11:02 2006 +0000

		@@ -726,7 +726,7 @@
726	726	win_T *w;
727	727	int n = 0;
728	728
729		- for (w = firstwin; w; w = w->w_next)
	729	+ for (w = firstwin; w != NULL; w = w->w_next)
730	730	n++;
731	731	return INT2NUM(n);
732	732	#else

diff -r f892bda292a8 -r 83a006f81bac src/main.c

--- a/src/main.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/main.c Thu Feb 16 22:11:02 2006 +0000

		@@ -1133,6 +1133,7 @@
1133	1133	#ifdef FEAT_AUTOCMD
1134	1134	buf_T *buf;
1135	1135	win_T *wp;
	1136	+ tabpage_T tp, next_tp;
1136	1137	#endif
1137	1138
1138	1139	exiting = TRUE;

		@@ -1160,23 +1161,28 @@
1160	1161
1161	1162	#ifdef FEAT_AUTOCMD
1162	1163	/* Trigger BufWinLeave for all windows, but only once per buffer. */
1163		- for (wp = firstwin; wp != NULL; )
	1164	+# if defined FEAT_WINDOWS
	1165	+ for (tp = first_tabpage; tp != NULL; tp = next_tp)
1164	1166	{
1165		- buf = wp->w_buffer;
1166		- if (buf->b_changedtick != -1)
	1167	+ next_tp = tp->tp_next;
	1168	+ for (wp = (tp->tp_topframe == topframe)
	1169	+ ? firstwin : tp->tp_firstwin; wp != NULL; wp = wp->w_next)
1167	1170	{
1168		- apply_autocmds(EVENT_BUFWINLEAVE, buf->b_fname, buf->b_fname,
	1171	+ buf = wp->w_buffer;
	1172	+ if (buf->b_changedtick != -1)
	1173	+ {
	1174	+ apply_autocmds(EVENT_BUFWINLEAVE, buf->b_fname, buf->b_fname,
1169	1175	FALSE, buf);
1170		- buf->b_changedtick = -1; /* note that we did it already */
1171		- wp = firstwin; /* restart, window may be closed */
	1176	+ buf->b_changedtick = -1; /* note that we did it already */
	1177	+ /* start all over, autocommands may mess up the lists */
	1178	+ next_tp = first_tabpage;
	1179	+ break;
	1180	+ }
1172	1181	}
1173		-# ifdef FEAT_WINDOWS
1174		- else
1175		- wp = wp->w_next;
	1182	+ }
1176	1183	# else
1177		- break;
	1184	+ apply_autocmds(EVENT_BUFWINLEAVE, curbuf, curbuf->b_fname, FALSE, curbuf);
1178	1185	# endif
1179		- }
1180	1186
1181	1187	/* Trigger BufUnload for buffers that are loaded */
1182	1188	for (buf = firstbuf; buf != NULL; buf = buf->b_next)

diff -r f892bda292a8 -r 83a006f81bac src/mark.c

--- a/src/mark.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/mark.c Thu Feb 16 22:11:02 2006 +0000

		@@ -1500,11 +1500,12 @@
1500	1500	int i;
1501	1501	#ifdef FEAT_WINDOWS
1502	1502	win_T *win;
	1503	+ tabpage_T *tp;
1503	1504
1504	1505	/*
1505	1506	* Set b_last_cursor for the all buffers that have a window.
1506	1507	*/
1507		- for (win = firstwin; win != NULL; win = win->w_next)
	1508	+ FOR_ALL_TAB_WINDOWS(tp, win)
1508	1509	set_last_cursor(win);
1509	1510	#else
1510	1511	set_last_cursor(curwin);

diff -r f892bda292a8 -r 83a006f81bac src/misc1.c

--- a/src/misc1.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/misc1.c Thu Feb 16 22:11:02 2006 +0000

		@@ -2458,6 +2458,7 @@
2458	2458	ml_setflags(curbuf);
2459	2459	#ifdef FEAT_WINDOWS
2460	2460	check_status(curbuf);
	2461	+ redraw_tabpage = TRUE;
2461	2462	#endif
2462	2463	#ifdef FEAT_TITLE
2463	2464	need_maketitle = TRUE; /* set window title later */

		@@ -2847,6 +2848,7 @@
2847	2848	save_file_ff(buf);
2848	2849	#ifdef FEAT_WINDOWS
2849	2850	check_status(buf);
	2851	+ redraw_tabpage = TRUE;
2850	2852	#endif
2851	2853	#ifdef FEAT_TITLE
2852	2854	need_maketitle = TRUE; /* set window title later */

diff -r f892bda292a8 -r 83a006f81bac src/misc2.c

--- a/src/misc2.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/misc2.c Thu Feb 16 22:11:02 2006 +0000

		@@ -2790,7 +2790,9 @@
2790	2790	set_string_option_direct((char_u )"ff", -1, (char_u )p,
2791	2791	OPT_FREE \| opt_flags);
2792	2792	#ifdef FEAT_WINDOWS
	2793	+ /* This may cause the buffer to become (un)modified. */
2793	2794	check_status(curbuf);
	2795	+ redraw_tabpage = TRUE;
2794	2796	#endif
2795	2797	#ifdef FEAT_TITLE
2796	2798	need_maketitle = TRUE; /* set window title later */

diff -r f892bda292a8 -r 83a006f81bac src/normal.c

--- a/src/normal.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/normal.c Thu Feb 16 22:11:02 2006 +0000

		@@ -2421,6 +2421,37 @@
2421	2421
2422	2422	start_visual.lnum = 0;
2423	2423
	2424	+#ifdef FEAT_WINDOWS
	2425	+ /* Check for clicking in the tab page line. */
	2426	+ if (mouse_row == 0 && firstwin->w_winrow > 0)
	2427	+ {
	2428	+ got_click = FALSE; /* ignore mouse-up and drag events */
	2429	+
	2430	+ /* click in last column closes the current tab page. */
	2431	+ if (mouse_col == Columns - 1 && first_tabpage->tp_next != NULL)
	2432	+ {
	2433	+ tabpage_close(FALSE);
	2434	+ return TRUE;
	2435	+ }
	2436	+
	2437	+ /* click in a tab selects that tab page */
	2438	+ if (is_click
	2439	+# ifdef FEAT_CMDWIN
	2440	+ && cmdwin_type == 0
	2441	+# endif
	2442	+ && mouse_col < Columns && TabPageIdxs[mouse_col] != 0xff)
	2443	+ {
	2444	+ goto_tabpage(TabPageIdxs[mouse_col]);
	2445	+
	2446	+ /* It's like clicking on the status line of a window. */
	2447	+ if (curwin != old_curwin)
	2448	+ end_visual_mode();
	2449	+ return TRUE;
	2450	+ }
	2451	+ return FALSE;
	2452	+ }
	2453	+#endif
	2454	+
2424	2455	/*
2425	2456	* When 'mousemodel' is "popup" or "popup_setpos", translate mouse events:
2426	2457	* right button up -> pop-up menu

diff -r f892bda292a8 -r 83a006f81bac src/option.c

--- a/src/option.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/option.c Thu Feb 16 22:11:02 2006 +0000

		@@ -2653,6 +2653,7 @@
2653	2653
2654	2654	static void set_option_default __ARGS((int, int opt_flags, int compatible));
2655	2655	static void set_options_default __ARGS((int opt_flags));
	2656	+static char_u *term_bg_default __ARGS((void));
2656	2657	static void did_set_option __ARGS((int opt_idx, int opt_flags, int new_value));
2657	2658	static char_u illegal_char __ARGS((char_u , int));
2658	2659	static int string_to_key __ARGS((char_u *arg));

		@@ -3200,6 +3201,7 @@
3200	3201	int i;
3201	3202	#ifdef FEAT_WINDOWS
3202	3203	win_T *wp;
	3204	+ tabpage_T *tp;
3203	3205	#endif
3204	3206
3205	3207	for (i = 0; !istermoption(&options[i]); i++)

		@@ -3208,7 +3210,7 @@
3208	3210
3209	3211	#ifdef FEAT_WINDOWS
3210	3212	/* The 'scroll' option must be computed for all windows. */
3211		- for (wp = firstwin; wp != NULL; wp = wp->w_next)
	3213	+ FOR_ALL_TAB_WINDOWS(tp, wp)
3212	3214	win_comp_scroll(wp);
3213	3215	#else
3214	3216	win_comp_scroll(curwin);

		@@ -3306,39 +3308,20 @@
3306	3308	p_window = Rows - 1;
3307	3309	set_number_default("window", Rows - 1);
3308	3310
	3311	+ /* For DOS console the default is always black. */
3309	3312	#if !((defined(MSDOS) \|\| defined(OS2) \|\| defined(WIN3264)) && !defined(FEAT_GUI))
3310		- {
3311		- char_u *p;
3312		-
3313		- /*
3314		- * If 'background' wasn't set by the user, try guessing the value,
3315		- * depending on the terminal name. Only need to check for terminals
3316		- * with a dark background, that can handle color. Recognized are:
3317		- * "linux" Linux console
3318		- * "screen.linux" Linux console with screen
3319		- * "cygwin" Cygwin shell
3320		- * "putty" Putty program
3321		- * We also check the COLORFGBG environment variable, which is set by
3322		- * rxvt and derivatives. This variable contains either two or three
3323		- * values separated by semicolons; we want the last value in either
3324		- * case. If this value is 0-6 or 8, our background is dark.
3325		- */
3326		- idx = findoption((char_u *)"bg");
3327		- if (!(options[idx].flags & P_WAS_SET)
3328		- && (STRCMP(T_NAME, "linux") == 0
3329		- \|\| STRCMP(T_NAME, "screen.linux") == 0
3330		- \|\| STRCMP(T_NAME, "cygwin") == 0
3331		- \|\| STRCMP(T_NAME, "putty") == 0
3332		- \|\| ((p = mch_getenv((char_u *)"COLORFGBG")) != NULL
3333		- && (p = vim_strrchr(p, ';')) != NULL
3334		- && ((p[1] >= '0' && p[1] <= '6') \|\| p[1] == '8')
3335		- && p[2] == NUL)))
3336		- {
3337		- set_string_option_direct(NULL, idx, (char_u *)"dark", OPT_FREE);
3338		- /* don't mark it as set, when starting the GUI it may be
3339		- * changed again */
3340		- options[idx].flags &= ~P_WAS_SET;
3341		- }
	3313	+ /*
	3314	+ * If 'background' wasn't set by the user, try guessing the value,
	3315	+ * depending on the terminal name. Only need to check for terminals
	3316	+ * with a dark background, that can handle color.
	3317	+ */
	3318	+ idx = findoption((char_u *)"bg");
	3319	+ if (!(options[idx].flags & P_WAS_SET) && *term_bg_default() == 'd')
	3320	+ {
	3321	+ set_string_option_direct(NULL, idx, (char_u *)"dark", OPT_FREE);
	3322	+ /* don't mark it as set, when starting the GUI it may be
	3323	+ * changed again */
	3324	+ options[idx].flags &= ~P_WAS_SET;
3342	3325	}
3343	3326	#endif
3344	3327

		@@ -3354,6 +3337,40 @@
3354	3337	}
3355	3338
3356	3339	/*
	3340	+ * Return "dark" or "light" depending on the kind of terminal.
	3341	+ * This is just guessing! Recognized are:
	3342	+ * "linux" Linux console
	3343	+ * "screen.linux" Linux console with screen
	3344	+ * "cygwin" Cygwin shell
	3345	+ * "putty" Putty program
	3346	+ * We also check the COLORFGBG environment variable, which is set by
	3347	+ * rxvt and derivatives. This variable contains either two or three
	3348	+ * values separated by semicolons; we want the last value in either
	3349	+ * case. If this value is 0-6 or 8, our background is dark.
	3350	+ */
	3351	+ static char_u *
	3352	+term_bg_default()
	3353	+{
	3354	+ char_u *p;
	3355	+
	3356	+#if defined(MSDOS) \|\| defined(OS2) \|\| defined(WIN3264)
	3357	+ /* DOS console nearly always black */
	3358	+ return (char_u *)"dark";
	3359	+#else
	3360	+ if (STRCMP(T_NAME, "linux") == 0
	3361	+ \|\| STRCMP(T_NAME, "screen.linux") == 0
	3362	+ \|\| STRCMP(T_NAME, "cygwin") == 0
	3363	+ \|\| STRCMP(T_NAME, "putty") == 0
	3364	+ \|\| ((p = mch_getenv((char_u *)"COLORFGBG")) != NULL
	3365	+ && (p = vim_strrchr(p, ';')) != NULL
	3366	+ && ((p[1] >= '0' && p[1] <= '6') \|\| p[1] == '8')
	3367	+ && p[2] == NUL))
	3368	+ return (char_u *)"dark";
	3369	+ return (char_u *)"light";
	3370	+#endif
	3371	+}
	3372	+
	3373	+/*
3357	3374	* Initialize the options, part three: After reading the .vimrc
3358	3375	*/
3359	3376	void

		@@ -4071,8 +4088,7 @@
4071	4088	newval = gui_bg_default();
4072	4089	else
4073	4090	#endif
4074		- if (STRCMP(T_NAME, "linux") == 0)
4075		- newval = (char_u *)"dark";
	4091	+ newval = term_bg_default();
4076	4092	}
4077	4093
4078	4094	/* expand environment variables and ~ (since the

diff -r f892bda292a8 -r 83a006f81bac src/proto/ex_docmd.pro

--- a/src/proto/ex_docmd.pro Wed Feb 15 22:18:42 2006 +0000

+++ b/src/proto/ex_docmd.pro Thu Feb 16 22:11:02 2006 +0000

		@@ -23,6 +23,8 @@
23	23	char_u get_user_cmd_complete __ARGS((expand_T xp, int idx));
24	24	int parse_compl_arg __ARGS((char_u value, int vallen, int complp, long argt, char_u *compl_arg));
25	25	void not_exiting __ARGS((void));
	26	+void tabpage_close __ARGS((int forceit));
	27	+void tabpage_close_other __ARGS((tabpage_T *tp, int forceit));
26	28	void handle_drop __ARGS((int filec, char_u **filev, int split));
27	29	void alist_clear __ARGS((alist_T *al));
28	30	void alist_init __ARGS((alist_T *al));

diff -r f892bda292a8 -r 83a006f81bac src/proto/window.pro

--- a/src/proto/window.pro Wed Feb 15 22:18:42 2006 +0000

+++ b/src/proto/window.pro Thu Feb 16 22:11:02 2006 +0000

		@@ -6,15 +6,18 @@
6	6	int make_windows __ARGS((int count, int vertical));
7	7	void win_move_after __ARGS((win_T win1, win_T win2));
8	8	void win_equal __ARGS((win_T *next_curwin, int current, int dir));
9		-void close_windows __ARGS((buf_T *buf));
	9	+void close_windows __ARGS((buf_T *buf, int keep_curwin));
10	10	int last_window __ARGS((void));
11	11	void win_close __ARGS((win_T *win, int free_buf));
	12	+void win_close_othertab __ARGS((win_T win, int free_buf, tabpage_T tp));
12	13	void win_free_all __ARGS((void));
13	14	void close_others __ARGS((int message, int forceit));
14	15	void win_init __ARGS((win_T *wp));
15	16	int win_alloc_first __ARGS((void));
16	17	void win_init_size __ARGS((void));
17	18	int win_new_tabpage __ARGS((void));
	19	+int valid_tabpage __ARGS((tabpage_T *tpc));
	20	+tabpage_T *find_tabpage __ARGS((int n));
18	21	void goto_tabpage __ARGS((int n));
19	22	void win_goto __ARGS((win_T *wp));
20	23	win_T *win_find_nr __ARGS((int winnr));

diff -r f892bda292a8 -r 83a006f81bac src/screen.c

--- a/src/screen.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/screen.c Thu Feb 16 22:11:02 2006 +0000

		@@ -6742,6 +6742,10 @@
6742	6742	sattr_T *new_ScreenAttrs;
6743	6743	unsigned *new_LineOffset;
6744	6744	char_u *new_LineWraps;
	6745	+#ifdef FEAT_WINDOWS
	6746	+ char_u *new_TabPageIdxs;
	6747	+ tabpage_T *tp;
	6748	+#endif
6745	6749	static int entered = FALSE; /* avoid recursiveness */
6746	6750	static int did_outofmem_msg = FALSE; /* did outofmem message */
6747	6751

		@@ -6788,10 +6792,10 @@
6788	6792	* size is wrong.
6789	6793	*/
6790	6794	#ifdef FEAT_WINDOWS
6791		- for (wp = firstwin; wp; wp = wp->w_next)
	6795	+ FOR_ALL_TAB_WINDOWS(tp, wp)
6792	6796	win_free_lsize(wp);
6793	6797	#else
6794		- win_free_lsize(curwin);
	6798	+ win_free_lsize(curwin);
6795	6799	#endif
6796	6800
6797	6801	new_ScreenLines = (schar_T *)lalloc((long_u)(

		@@ -6815,6 +6819,9 @@
6815	6819	new_LineOffset = (unsigned *)lalloc((long_u)(
6816	6820	Rows * sizeof(unsigned)), FALSE);
6817	6821	new_LineWraps = (char_u )lalloc((long_u)(Rows sizeof(char_u)), FALSE);
	6822	+#ifdef FEAT_WINDOWS
	6823	+ new_TabPageIdxs = (char_u )lalloc((long_u)(Columns sizeof(char_u)), FALSE);
	6824	+#endif
6818	6825
6819	6826	FOR_ALL_WINDOWS(wp)
6820	6827	{

		@@ -6836,6 +6843,9 @@
6836	6843	\|\| new_ScreenAttrs == NULL
6837	6844	\|\| new_LineOffset == NULL
6838	6845	\|\| new_LineWraps == NULL
	6846	+#ifdef FEAT_WINDOWS
	6847	+ \|\| new_TabPageIdxs == NULL
	6848	+#endif
6839	6849	\|\| outofmem)
6840	6850	{
6841	6851	if (ScreenLines != NULL \|\| !did_outofmem_msg)

		@@ -6865,6 +6875,10 @@
6865	6875	new_LineOffset = NULL;
6866	6876	vim_free(new_LineWraps);
6867	6877	new_LineWraps = NULL;
	6878	+#ifdef FEAT_WINDOWS
	6879	+ vim_free(new_TabPageIdxs);
	6880	+ new_TabPageIdxs = NULL;
	6881	+#endif
6868	6882	}
6869	6883	else
6870	6884	{

		@@ -6956,6 +6970,9 @@
6956	6970	ScreenAttrs = new_ScreenAttrs;
6957	6971	LineOffset = new_LineOffset;
6958	6972	LineWraps = new_LineWraps;
	6973	+#ifdef FEAT_WINDOWS
	6974	+ TabPageIdxs = new_TabPageIdxs;
	6975	+#endif
6959	6976
6960	6977	/* It's important that screen_Rows and screen_Columns reflect the actual
6961	6978	* size of ScreenLines[]. Set them before calling anything. */

		@@ -7005,6 +7022,9 @@
7005	7022	vim_free(ScreenAttrs);
7006	7023	vim_free(LineOffset);
7007	7024	vim_free(LineWraps);
	7025	+#ifdef FEAT_WINDOWS
	7026	+ vim_free(TabPageIdxs);
	7027	+#endif
7008	7028	}
7009	7029
7010	7030	void

		@@ -8443,9 +8463,13 @@
8443	8463	tabpage_T *tp;
8444	8464	int tabwidth;
8445	8465	int col = 0;
	8466	+ int scol;
8446	8467	int had_current = FALSE;
8447	8468	int attr;
8448	8469	win_T *wp;
	8470	+ win_T *cwp;
	8471	+ int wincount;
	8472	+ int modified;
8449	8473	int c;
8450	8474	int len;
8451	8475	int attr_sel = hl_attr(HLF_TPS);

		@@ -8460,13 +8484,16 @@
8460	8484	for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
8461	8485	++tabcount;
8462	8486
8463		- tabwidth = Columns / tabcount;
	8487	+ tabwidth = (Columns - 1 + tabcount / 2) / tabcount;
8464	8488	if (tabwidth < 6)
8465	8489	tabwidth = 6;
8466	8490
8467	8491	attr = attr_nosel;
8468		- for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
8469		- {
	8492	+ tabcount = 0;
	8493	+ for (tp = first_tabpage; tp != NULL && col < Columns; tp = tp->tp_next)
	8494	+ {
	8495	+ scol = col;
	8496	+
8470	8497	if (tp->tp_topframe == topframe)
8471	8498	{
8472	8499	c = '/';

		@@ -8486,21 +8513,55 @@
8486	8513	screen_putchar(' ', 0, col++, attr);
8487	8514
8488	8515	if (tp->tp_topframe == topframe)
8489		- wp = curwin;
	8516	+ {
	8517	+ cwp = curwin;
	8518	+ wp = firstwin;
	8519	+ }
8490	8520	else
8491		- wp = tp->tp_curwin;
8492		- if (buf_spname(wp->w_buffer) != NULL)
8493		- STRCPY(NameBuff, buf_spname(wp->w_buffer));
	8521	+ {
	8522	+ cwp = tp->tp_curwin;
	8523	+ wp = tp->tp_firstwin;
	8524	+ }
	8525	+
	8526	+ modified = FALSE;
	8527	+ for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount)
	8528	+ if (bufIsChanged(wp->w_buffer))
	8529	+ modified = TRUE;
	8530	+ if (modified \|\| wincount > 1)
	8531	+ {
	8532	+ if (wincount > 1)
	8533	+ {
	8534	+ vim_snprintf((char *)NameBuff, MAXPATHL, "#%d", wincount);
	8535	+ len = STRLEN(NameBuff);
	8536	+ screen_puts_len(NameBuff, len, 0, col, attr);
	8537	+ col += len;
	8538	+ }
	8539	+ if (modified)
	8540	+ screen_puts_len((char_u *)"+", 2, 0, col++, attr);
	8541	+ screen_putchar(' ', 0, col++, attr);
	8542	+ }
	8543	+
	8544	+ if (buf_spname(cwp->w_buffer) != NULL)
	8545	+ STRCPY(NameBuff, buf_spname(cwp->w_buffer));
8494	8546	else
8495		- home_replace(wp->w_buffer, wp->w_buffer->b_fname, NameBuff,
	8547	+ home_replace(cwp->w_buffer, cwp->w_buffer->b_fname, NameBuff,
8496	8548	MAXPATHL, TRUE);
8497	8549	trans_characters(NameBuff, MAXPATHL);
8498	8550	len = STRLEN(NameBuff);
8499		- if (len > tabwidth) /* TODO: multi-byte chars */
8500		- len = tabwidth;
8501		- screen_puts_len(NameBuff, len, 0, col, attr);
8502		- col += len;
	8551	+ if (len > scol - col + tabwidth - 1) /* TODO: multi-byte chars */
	8552	+ len = scol - col + tabwidth - 1;
	8553	+ if (len > 0)
	8554	+ {
	8555	+ screen_puts_len(NameBuff, len, 0, col, attr);
	8556	+ col += len;
	8557	+ }
8503	8558	screen_putchar(' ', 0, col++, attr);
	8559	+
	8560	+ /* Store the tab page number in TabPageIdxs[], so that jump_to_mouse()
	8561	+ * knows where each one is. */
	8562	+ ++tabcount;
	8563	+ while (scol < col)
	8564	+ TabPageIdxs[scol++] = tabcount;
8504	8565	}
8505	8566
8506	8567	if (t_colors < 8)

		@@ -8511,6 +8572,14 @@
8511	8572	else
8512	8573	c = ' ';
8513	8574	screen_fill(0, 1, col, (int)Columns, c, c, attr_fill);
	8575	+
	8576	+ /* Put an "X" for closing the current tab if there are several. */
	8577	+ if (first_tabpage->tp_next != NULL)
	8578	+ screen_putchar('X', 0, (int)Columns - 1, attr_nosel);
	8579	+
	8580	+ /* Clicking outside of tabs has no effect. */
	8581	+ while (scol < Columns)
	8582	+ TabPageIdxs[scol++] = 0xff;
8514	8583	}
8515	8584	#endif
8516	8585

diff -r f892bda292a8 -r 83a006f81bac src/structs.h

--- a/src/structs.h Wed Feb 15 22:18:42 2006 +0000

+++ b/src/structs.h Thu Feb 16 22:11:02 2006 +0000

		@@ -1558,6 +1558,7 @@
1558	1558	tabpage_T tp_next; / next tabpage or NULL */
1559	1559	frame_T tp_topframe; / topframe for the windows */
1560	1560	win_T tp_curwin; / current window in this Tab page */
	1561	+ win_T tp_prevwin; / previous window in this Tab page */
1561	1562	win_T tp_firstwin; / first window in this Tab page */
1562	1563	win_T tp_lastwin; / last window in this Tab page */
1563	1564	long tp_old_Rows; /* Rows when Tab page was left */

diff -r f892bda292a8 -r 83a006f81bac src/version.h

--- a/src/version.h Wed Feb 15 22:18:42 2006 +0000

+++ b/src/version.h Thu Feb 16 22:11:02 2006 +0000

		@@ -36,5 +36,5 @@
36	36	#define VIM_VERSION_NODOT "vim70aa"
37	37	#define VIM_VERSION_SHORT "7.0aa"
38	38	#define VIM_VERSION_MEDIUM "7.0aa ALPHA"
39		-#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 15)"
40		-#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 15, compiled "
	39	+#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 16)"
	40	+#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 16, compiled "

diff -r f892bda292a8 -r 83a006f81bac src/window.c

--- a/src/window.c Wed Feb 15 22:18:42 2006 +0000

+++ b/src/window.c Thu Feb 16 22:11:02 2006 +0000

		@@ -25,9 +25,9 @@
25	25	static void win_rotate __ARGS((int, int));
26	26	static void win_totop __ARGS((int size, int flags));
27	27	static void win_equal_rec __ARGS((win_T next_curwin, int current, frame_T topfr, int dir, int col, int row, int width, int height));
28		-static win_T win_free_mem __ARGS((win_T win, int *dirp));
29		-static win_T winframe_remove __ARGS((win_T win, int *dirp));
30		-static frame_T win_altframe __ARGS((win_T win));
	28	+static win_T win_free_mem __ARGS((win_T win, int dirp, tabpage_T tp));
	29	+static win_T winframe_remove __ARGS((win_T win, int dirp, tabpage_T tp));
	30	+static frame_T win_altframe __ARGS((win_T win, tabpage_T *tp));
31	31	static tabpage_T *alt_tabpage __ARGS((void));
32	32	static win_T frame2win __ARGS((frame_T frp));
33	33	static int frame_has_win __ARGS((frame_T frp, win_T wp));

		@@ -49,9 +49,9 @@
49	49	static void frame_fix_height __ARGS((win_T *wp));
50	50	static int frame_minheight __ARGS((frame_T topfrp, win_T next_curwin));
51	51	static void win_enter_ext __ARGS((win_T *wp, int undo_sync, int no_curwin));
52		-static void win_free __ARGS((win_T *wp));
	52	+static void win_free __ARGS((win_T wp, tabpage_T tp));
53	53	static void win_append __ARGS((win_T , win_T ));
54		-static void win_remove __ARGS((win_T *));
	54	+static void win_remove __ARGS((win_T , tabpage_T tp));
55	55	static void frame_append __ARGS((frame_T after, frame_T frp));
56	56	static void frame_insert __ARGS((frame_T before, frame_T frp));
57	57	static void frame_remove __ARGS((frame_T *frp));

		@@ -1262,14 +1262,14 @@
1262	1262	frp2 = curwin->w_frame->fr_prev;
1263	1263	if (wp->w_prev != curwin)
1264	1264	{
1265		- win_remove(curwin);
	1265	+ win_remove(curwin, NULL);
1266	1266	frame_remove(curwin->w_frame);
1267	1267	win_append(wp->w_prev, curwin);
1268	1268	frame_insert(frp, curwin->w_frame);
1269	1269	}
1270	1270	if (wp != wp2)
1271	1271	{
1272		- win_remove(wp);
	1272	+ win_remove(wp, NULL);
1273	1273	frame_remove(wp->w_frame);
1274	1274	win_append(wp2, wp);
1275	1275	if (frp2 == NULL)

		@@ -1353,7 +1353,7 @@
1353	1353	/* remove first window/frame from the list */
1354	1354	frp = curwin->w_frame->fr_parent->fr_child;
1355	1355	wp1 = frp->fr_win;
1356		- win_remove(wp1);
	1356	+ win_remove(wp1, NULL);
1357	1357	frame_remove(frp);
1358	1358
1359	1359	/* find last frame and append removed window/frame after it */

		@@ -1372,7 +1372,7 @@
1372	1372	;
1373	1373	wp1 = frp->fr_win;
1374	1374	wp2 = wp1->w_prev; /* will become last window */
1375		- win_remove(wp1);
	1375	+ win_remove(wp1, NULL);
1376	1376	frame_remove(frp);
1377	1377
1378	1378	/* append the removed window/frame before the first in the list */

		@@ -1419,8 +1419,8 @@
1419	1419	}
1420	1420
1421	1421	/* Remove the window and frame from the tree of frames. */
1422		- (void)winframe_remove(curwin, &dir);
1423		- win_remove(curwin);
	1422	+ (void)winframe_remove(curwin, &dir, NULL);
	1423	+ win_remove(curwin, NULL);
1424	1424	last_status(FALSE); /* may need to remove last status line */
1425	1425	(void)win_comp_pos(); /* recompute window positions */
1426	1426

		@@ -1486,7 +1486,7 @@
1486	1486	win1->w_vsep_width = 0;
1487	1487	#endif
1488	1488	}
1489		- win_remove(win1);
	1489	+ win_remove(win1, NULL);
1490	1490	frame_remove(win1->w_frame);
1491	1491	win_append(win2, win1);
1492	1492	frame_append(win2->w_frame, win1->w_frame);

		@@ -1797,23 +1797,50 @@
1797	1797	* close all windows for buffer 'buf'
1798	1798	*/
1799	1799	void
1800		-close_windows(buf)
	1800	+close_windows(buf, keep_curwin)
1801	1801	buf_T *buf;
	1802	+ int keep_curwin; /* don't close "curwin" */
1802	1803	{
1803		- win_T *win;
	1804	+ win_T *wp;
	1805	+ tabpage_T tp, nexttp;
	1806	+ int h = tabpageline_height();
1804	1807
1805	1808	++RedrawingDisabled;
1806		- for (win = firstwin; win != NULL && lastwin != firstwin; )
	1809	+
	1810	+ for (wp = firstwin; wp != NULL && lastwin != firstwin; )
1807	1811	{
1808		- if (win->w_buffer == buf)
	1812	+ if (wp->w_buffer == buf && (!keep_curwin \|\| wp != curwin))
1809	1813	{
1810		- win_close(win, FALSE);
1811		- win = firstwin; /* go back to the start */
	1814	+ win_close(wp, FALSE);
	1815	+
	1816	+ /* Start all over, autocommands may change the window layout. */
	1817	+ wp = firstwin;
1812	1818	}
1813	1819	else
1814		- win = win->w_next;
	1820	+ wp = wp->w_next;
1815	1821	}
	1822	+
	1823	+ /* Also check windows in other tab pages. */
	1824	+ for (tp = first_tabpage; tp != NULL; tp = nexttp)
	1825	+ {
	1826	+ nexttp = tp->tp_next;
	1827	+ if (tp->tp_topframe != topframe)
	1828	+ for (wp = tp->tp_firstwin; wp != NULL; wp = wp->w_next)
	1829	+ if (wp->w_buffer == buf)
	1830	+ {
	1831	+ win_close_othertab(wp, FALSE, tp);
	1832	+
	1833	+ /* Start all over, the tab page may be closed and
	1834	+ * autocommands may change the window layout. */
	1835	+ nexttp = first_tabpage;
	1836	+ break;
	1837	+ }
	1838	+ }
	1839	+
1816	1840	--RedrawingDisabled;
	1841	+
	1842	+ if (h != tabpageline_height())
	1843	+ shell_new_rows();
1817	1844	}
1818	1845
1819	1846	/*

		@@ -1827,7 +1854,7 @@
1827	1854	}
1828	1855
1829	1856	/*
1830		- * close window "win"
	1857	+ * Close window "win".
1831	1858	* If "free_buf" is TRUE related buffer may be unloaded.
1832	1859	*
1833	1860	* called by :quit, :close, :xit, :wq and findtag()

		@@ -1866,7 +1893,7 @@
1866	1893	* Guess which window is going to be the new current window.
1867	1894	* This may change because of the autocommands (sigh).
1868	1895	*/
1869		- wp = frame2win(win_altframe(win));
	1896	+ wp = frame2win(win_altframe(win, NULL));
1870	1897
1871	1898	/*
1872	1899	* Be careful: If autocommands delete the window, return now.

		@@ -1899,7 +1926,7 @@
1899	1926	return;
1900	1927
1901	1928	/* Free the memory used for the window. */
1902		- wp = win_free_mem(win, &dir);
	1929	+ wp = win_free_mem(win, &dir, NULL);
1903	1930
1904	1931	/* When closing the last window in a tab page go to another tab page. */
1905	1932	if (wp == NULL)

		@@ -2004,13 +2031,70 @@
2004	2031	}
2005	2032
2006	2033	/*
	2034	+ * Close window "win" in tab page "tp", which is not the current tab page.
	2035	+ * This may be the last window ih that tab page and result in closing the tab,
	2036	+ * thus "tp" may become invalid!
	2037	+ * Called must check if buffer is hidden.
	2038	+ */
	2039	+ void
	2040	+win_close_othertab(win, free_buf, tp)
	2041	+ win_T *win;
	2042	+ int free_buf;
	2043	+ tabpage_T *tp;
	2044	+{
	2045	+ win_T *wp;
	2046	+ int dir;
	2047	+ tabpage_T *ptp = NULL;
	2048	+
	2049	+ /* Close the link to the buffer. */
	2050	+ close_buffer(win, win->w_buffer, free_buf ? DOBUF_UNLOAD : 0);
	2051	+
	2052	+ /* Careful: Autocommands may have closed the tab page or made it the
	2053	+ * current tab page. */
	2054	+ for (ptp = first_tabpage; ptp != NULL && ptp != tp; ptp = ptp->tp_next)
	2055	+ ;
	2056	+ if (ptp == NULL \|\| tp->tp_topframe == topframe)
	2057	+ return;
	2058	+
	2059	+ /* Autocommands may have closed the window already. */
	2060	+ for (wp = tp->tp_firstwin; wp != NULL && wp != win; wp = wp->w_next)
	2061	+ ;
	2062	+ if (wp == NULL)
	2063	+ return;
	2064	+
	2065	+ /* Free the memory used for the window. */
	2066	+ wp = win_free_mem(win, &dir, tp);
	2067	+
	2068	+ /* When closing the last window in a tab page remove the tab page. */
	2069	+ if (wp == NULL)
	2070	+ {
	2071	+ if (tp == first_tabpage)
	2072	+ first_tabpage = tp->tp_next;
	2073	+ else
	2074	+ {
	2075	+ for (ptp = first_tabpage; ptp != NULL && ptp->tp_next != tp;
	2076	+ ptp = ptp->tp_next)
	2077	+ ;
	2078	+ if (ptp == NULL)
	2079	+ {
	2080	+ EMSG2(_(e_intern2), "win_close_othertab()");
	2081	+ return;
	2082	+ }
	2083	+ ptp->tp_next = tp->tp_next;
	2084	+ }
	2085	+ vim_free(tp);
	2086	+ }
	2087	+}
	2088	+
	2089	+/*
2007	2090	* Free the memory used for a window.
2008	2091	* Returns a pointer to the window that got the freed up space.
2009	2092	*/
2010	2093	static win_T *
2011		-win_free_mem(win, dirp)
	2094	+win_free_mem(win, dirp, tp)
2012	2095	win_T *win;
2013	2096	int dirp; / set to 'v' or 'h' for direction if 'ea' */
	2097	+ tabpage_T tp; / tab page "win" is in, NULL for current */
2014	2098	{
2015	2099	frame_T *frp;
2016	2100	win_T *wp;

		@@ -2024,13 +2108,9 @@
2024	2108
2025	2109	/* Remove the window and its frame from the tree of frames. */
2026	2110	frp = win->w_frame;
2027		- if (firstwin == lastwin)
2028		- /* Last window in a tab page. */
2029		- wp = NULL;
2030		- else
2031		- wp = winframe_remove(win, dirp);
	2111	+ wp = winframe_remove(win, dirp, tp);
2032	2112	vim_free(frp);
2033		- win_free(win);
	2113	+ win_free(win, tp);
2034	2114
2035	2115	return wp;
2036	2116	}

		@@ -2041,8 +2121,13 @@
2041	2121	{
2042	2122	int dummy;
2043	2123
	2124	+# ifdef FEAT_WINDOWS
	2125	+ while (first_tabpage->tp_next != NULL)
	2126	+ tabpage_close(TRUE);
	2127	+# endif
	2128	+
2044	2129	while (firstwin != NULL)
2045		- (void)win_free_mem(firstwin, &dummy);
	2130	+ (void)win_free_mem(firstwin, &dummy, NULL);
2046	2131	}
2047	2132	#endif
2048	2133

		@@ -2052,9 +2137,10 @@
2052	2137	*/
2053	2138	/ARGSUSED/
2054	2139	static win_T *
2055		-winframe_remove(win, dirp)
	2140	+winframe_remove(win, dirp, tp)
2056	2141	win_T *win;
2057	2142	int dirp; / set to 'v' or 'h' for direction if 'ea' */
	2143	+ tabpage_T tp; / tab page "win" is in, NULL for current */
2058	2144	{
2059	2145	frame_T frp, frp2, *frp3;
2060	2146	frame_T *frp_close = win->w_frame;

		@@ -2062,12 +2148,15 @@
2062	2148	int old_height = 0;
2063	2149
2064	2150	/*
	2151	+ * If there is only one window there is nothing to remove.
	2152	+ */
	2153	+ if (tp == NULL ? firstwin == lastwin : tp->tp_firstwin == tp->tp_lastwin)
	2154	+ return NULL;
	2155	+
	2156	+ /*
2065	2157	* Remove the window from its frame.
2066	2158	*/
2067		- frp2 = win_altframe(win);
2068		- if (frp2 == NULL)
2069		- return NULL; /* deleted the last frame */
2070		-
	2159	+ frp2 = win_altframe(win, tp);
2071	2160	wp = frame2win(frp2);
2072	2161
2073	2162	/* Remove this frame from the list of frames. */

		@@ -2160,13 +2249,14 @@
2160	2249	* layout.
2161	2250	*/
2162	2251	static frame_T *
2163		-win_altframe(win)
	2252	+win_altframe(win, tp)
2164	2253	win_T *win;
	2254	+ tabpage_T tp; / tab page "win" is in, NULL for current */
2165	2255	{
2166	2256	frame_T *frp;
2167	2257	int b;
2168	2258
2169		- if (firstwin == lastwin)
	2259	+ if (tp == NULL ? firstwin == lastwin : tp->tp_firstwin == tp->tp_lastwin)
2170	2260	/* Last window in this tab page, will go to next tab page. */
2171	2261	return alt_tabpage()->tp_curwin->w_frame;
2172	2262

		@@ -2861,6 +2951,7 @@
2861	2951	firstwin->w_winrow = tabpageline_height();
2862	2952
2863	2953	newtp->tp_topframe = topframe;
	2954	+ last_status(FALSE);
2864	2955	redraw_all_later(CLEAR);
2865	2956	return OK;
2866	2957	}

		@@ -2868,6 +2959,7 @@
2868	2959	/* Failed, get back the previous Tab page */
2869	2960	topframe = tp->tp_topframe;
2870	2961	curwin = tp->tp_curwin;
	2962	+ prevwin = tp->tp_prevwin;
2871	2963	firstwin = tp->tp_firstwin;
2872	2964	lastwin = tp->tp_lastwin;
2873	2965	return FAIL;

		@@ -2890,6 +2982,36 @@
2890	2982	}
2891	2983
2892	2984	/*
	2985	+ * Return TRUE when "tpc" points to a valid tab page.
	2986	+ */
	2987	+ int
	2988	+valid_tabpage(tpc)
	2989	+ tabpage_T *tpc;
	2990	+{
	2991	+ tabpage_T *tp;
	2992	+
	2993	+ for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
	2994	+ if (tp == tpc)
	2995	+ return TRUE;
	2996	+ return FALSE;
	2997	+}
	2998	+
	2999	+/*
	3000	+ * Find tab page "n" (first one is 1). Returns NULL when not found.
	3001	+ */
	3002	+ tabpage_T *
	3003	+find_tabpage(n)
	3004	+ int n;
	3005	+{
	3006	+ tabpage_T *tp;
	3007	+ int i = 1;
	3008	+
	3009	+ for (tp = first_tabpage; tp != NULL && i != n; tp = tp->tp_next)
	3010	+ ++i;
	3011	+ return tp;
	3012	+}
	3013	+
	3014	+/*
2893	3015	* Prepare for leaving the current tab page "tp".
2894	3016	*/
2895	3017	static void

		@@ -2902,6 +3024,7 @@
2902	3024	gui_remove_scrollbars();
2903	3025	#endif
2904	3026	tp->tp_curwin = curwin;
	3027	+ tp->tp_prevwin = prevwin;
2905	3028	tp->tp_firstwin = firstwin;
2906	3029	tp->tp_lastwin = lastwin;
2907	3030	tp->tp_old_Rows = Rows;

		@@ -2925,6 +3048,7 @@
2925	3048	lastwin = tp->tp_lastwin;
2926	3049	topframe = tp->tp_topframe;
2927	3050	win_enter_ext(tp->tp_curwin, FALSE, TRUE);
	3051	+ prevwin = tp->tp_prevwin;
2928	3052
2929	3053	#ifdef FEAT_AUTOCMD
2930	3054	if (old_curbuf != curbuf)

		@@ -2985,12 +3109,13 @@
2985	3109	{
2986	3110	/* Go to tab page "n". */
2987	3111	i = 0;
2988		- for (tp = first_tabpage; ++i != n; tp = tp->tp_next)
2989		- if (tp == NULL)
2990		- {
2991		- beep_flush();
2992		- return;
2993		- }
	3112	+ for (tp = first_tabpage; ++i != n && tp != NULL; tp = tp->tp_next)
	3113	+ ;
	3114	+ if (tp == NULL)
	3115	+ {
	3116	+ beep_flush();
	3117	+ return;
	3118	+ }
2994	3119	}
2995	3120
2996	3121	leave_tabpage(otp);

		@@ -3418,8 +3543,9 @@
3418	3543	* remove window 'wp' from the window list and free the structure
3419	3544	*/
3420	3545	static void
3421		-win_free(wp)
	3546	+win_free(wp, tp)
3422	3547	win_T *wp;
	3548	+ tabpage_T tp; / tab page "win" is in, NULL for current */
3423	3549	{
3424	3550	int i;
3425	3551

		@@ -3478,7 +3604,7 @@
3478	3604	}
3479	3605	#endif /* FEAT_GUI */
3480	3606
3481		- win_remove(wp);
	3607	+ win_remove(wp, tp);
3482	3608	vim_free(wp);
3483	3609	}
3484	3610

		@@ -3512,17 +3638,22 @@
3512	3638	* Remove a window from the window list.
3513	3639	*/
3514	3640	static void
3515		-win_remove(wp)
	3641	+win_remove(wp, tp)
3516	3642	win_T *wp;
	3643	+ tabpage_T tp; / tab page "win" is in, NULL for current */
3517	3644	{
3518	3645	if (wp->w_prev != NULL)
3519	3646	wp->w_prev->w_next = wp->w_next;
	3647	+ else if (tp == NULL)
	3648	+ firstwin = wp->w_next;
3520	3649	else
3521		- firstwin = wp->w_next;
	3650	+ tp->tp_firstwin = wp->w_next;
3522	3651	if (wp->w_next != NULL)
3523	3652	wp->w_next->w_prev = wp->w_prev;
	3653	+ else if (tp == NULL)
	3654	+ lastwin = wp->w_prev;
3524	3655	else
3525		- lastwin = wp->w_prev;
	3656	+ tp->tp_lastwin = wp->w_prev;
3526	3657	}
3527	3658
3528	3659	/*

		@@ -3600,6 +3731,7 @@
3600	3731
3601	3732	/*
3602	3733	* Called from win_new_shellsize() after Rows changed.
	3734	+ * This only does the current tab page, others must be done when made active.
3603	3735	*/
3604	3736	void
3605	3737	shell_new_rows()

		@@ -5115,16 +5247,27 @@
5115	5247	min_rows()
5116	5248	{
5117	5249	int total;
	5250	+#ifdef FEAT_WINDOWS
	5251	+ tabpage_T *tp;
	5252	+ int n;
	5253	+#endif
5118	5254
5119	5255	if (firstwin == NULL) /* not initialized yet */
5120	5256	return MIN_LINES;
5121	5257
5122		- total = 1; /* count the room for the command line */
5123	5258	#ifdef FEAT_WINDOWS
5124		- total += frame_minheight(topframe, NULL);
	5259	+ total = 0;
	5260	+ for (tp = first_tabpage; tp != NULL; tp = tp->tp_next)
	5261	+ {
	5262	+ n = frame_minheight(tp->tp_topframe, NULL);
	5263	+ if (total < n)
	5264	+ total = n;
	5265	+ }
	5266	+ total += tabpageline_height();
5125	5267	#else
5126		- total += 1; /* at least one window should have a line! */
	5268	+ total = 1; /* at least one window should have a line! */
5127	5269	#endif
	5270	+ total += 1; /* count the room for the command line */
5128	5271	return total;
5129	5272	}
5130	5273

		@@ -5169,7 +5312,9 @@
5169	5312	win_T *wp;
5170	5313
5171	5314	#ifdef FEAT_WINDOWS
5172		- for (wp = firstwin; wp != NULL; wp = wp->w_next)
	5315	+ tabpage_T *tp;
	5316	+
	5317	+ FOR_ALL_TAB_WINDOWS(tp, wp)
5173	5318	if ((do_curwin \|\| wp != curwin) && wp->w_buffer == curbuf)
5174	5319	#else
5175	5320	wp = curwin;

Show on old repository browser