diff options
| -rw-r--r-- | runtime/doc/tags | 8 | ||||
| -rw-r--r-- | runtime/doc/windows.txt | 9 | ||||
| -rw-r--r-- | runtime/filetype.vim | 5 | ||||
| -rw-r--r-- | runtime/spell/sv/sv_SE.diff | 539 | ||||
| -rw-r--r-- | runtime/syntax/yacc.vim | 12 | ||||
| -rw-r--r-- | src/Make_vms.mms | 10 | ||||
| -rw-r--r-- | src/edit.c | 9 | ||||
| -rw-r--r-- | src/ex_cmds2.c | 3 | ||||
| -rw-r--r-- | src/ex_getln.c | 11 | ||||
| -rw-r--r-- | src/proto/window.pro | 4 | ||||
| -rw-r--r-- | src/structs.h | 1 | ||||
| -rw-r--r-- | src/syntax.c | 4 | ||||
| -rw-r--r-- | src/term.c | 12 | ||||
| -rw-r--r-- | src/version.h | 4 |
14 files changed, 104 insertions, 527 deletions
diff --git a/runtime/doc/tags b/runtime/doc/tags index 278e1ba9a..015ac258a 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -2644,16 +2644,23 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* :tNext tagsrch.txt /*:tNext* :ta tagsrch.txt /*:ta* :tab tabpage.txt /*:tab* +:tabN tabpage.txt /*:tabN* +:tabNext tabpage.txt /*:tabNext* :tabc tabpage.txt /*:tabc* :tabclose tabpage.txt /*:tabclose* :tabe tabpage.txt /*:tabe* :tabedit tabpage.txt /*:tabedit* :tabf tabpage.txt /*:tabf* :tabfind tabpage.txt /*:tabfind* +:tabm tabpage.txt /*:tabm* +:tabmove tabpage.txt /*:tabmove* :tabn tabpage.txt /*:tabn* :tabnew tabpage.txt /*:tabnew* +:tabnext tabpage.txt /*:tabnext* :tabo tabpage.txt /*:tabo* :tabonly tabpage.txt /*:tabonly* +:tabp tabpage.txt /*:tabp* +:tabprevious tabpage.txt /*:tabprevious* :tabs tabpage.txt /*:tabs* :tag tagsrch.txt /*:tag* :tags tagsrch.txt /*:tags* @@ -5293,6 +5300,7 @@ gJ change.txt /*gJ* gP change.txt /*gP* gQ intro.txt /*gQ* gR change.txt /*gR* +gT tabpage.txt /*gT* gU change.txt /*gU* gUU change.txt /*gUU* gUgU change.txt /*gUgU* diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index 97e015e0c..cd57287f3 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -1,4 +1,4 @@ -*windows.txt* For Vim version 7.0aa. Last change: 2006 Feb 18 +*windows.txt* For Vim version 7.0aa. Last change: 2006 Feb 23 VIM REFERENCE MANUAL by Bram Moolenaar @@ -954,9 +954,10 @@ list of buffers. |unlisted-buffer| :bw[ipeout][!] {bufname} :N,Mbw[ipeout][!] :bw[ipeout][!] N1 N2 ... - Like |:bdelete|, but really delete the buffer. All marks in - this buffer become invalid, option settings are lost, etc. - Don't use this unless you know what you are doing. + Like |:bdelete|, but really delete the buffer. Everything + related to the buffer is lost. All marks in this buffer + become invalid, option settings are lost, etc. Don't use this + unless you know what you are doing. :[N]bun[load][!] *:bun* *:bunload* *E515* :bun[load][!] [N] diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 3a4d70ff9..a7b858517 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2006 Jan 12 +" Last Change: 2006 Feb 23 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -891,6 +891,9 @@ au BufNewFile,BufRead *.mf setf mf " MetaPost au BufNewFile,BufRead *.mp setf mp +" MGL +au BufNewFile,BufRead *.mgl setf mgl + " MMIX or VMS makefile au BufNewFile,BufRead *.mms call s:FTmms() diff --git a/runtime/spell/sv/sv_SE.diff b/runtime/spell/sv/sv_SE.diff index 5a0b38352..ad8b3a7d6 100644 --- a/runtime/spell/sv/sv_SE.diff +++ b/runtime/spell/sv/sv_SE.diff @@ -1,5 +1,5 @@ -*** sv_SE.orig.aff Wed Aug 31 21:00:19 2005 ---- sv_SE.aff Fri Sep 30 14:09:19 2005 +*** sv_SE.orig.aff 2003-08-14 14:00:32.000000000 +0200 +--- sv_SE.aff 2006-02-21 20:33:31.687500000 +0100 *************** *** 6,7 **** --- 6,22 ---- @@ -139,547 +139,82 @@ + SAL Ä E + SAL ÖG(IE)-6 ÖK # vokal+g(ie) ger ej j-ljud + SAL Ö Ö -*** sv_SE.orig.dic 2003-08-14 13:02:06.000000000 +0200 ---- sv_SE.dic 2005-10-15 18:15:52.171875000 +0200 +*** sv_SE.orig.dic 2003-08-14 14:02:06.000000000 +0200 +--- sv_SE.dic 2006-02-23 18:39:11.218750000 +0100 *************** -*** 108,113 **** ---- 108,114 ---- - adoption/ADHS - adoptivbarn/BDS - adoptivson/ADS -+ adr. - adrenalin/BS - adress/DHS - adressat/ADHS +*** 4317,4319 **** + dvaldes/S +! dvs + dväljas/S +--- 4317,4319 ---- + dvaldes/S +! #dvs Removed by Stefan. + dväljas/S *************** -*** 608,613 **** ---- 609,615 ---- - anlöps/S - anlöpta/JRS - anm +*** 24490 **** +--- 24490,24554 ---- + åvila/MS ++ ++ # Additions by Stefan: ++ SEK ++ adr. + anm. - anmaning/ADGS - anmoda/ABCDEFMNPS - anmodande/ACEFS -*************** -*** 973,978 **** ---- 975,981 ---- - arrogant/OS - arsenal/DHS - arsenik/DS + art. - art/ADHOS - arta/CHJMNPS - artefakt/DHS -*************** -*** 1094,1099 **** ---- 1097,1103 ---- - audiens/DHS - auditorie/CIS - auditorium/JS + aug. - August/A - augusti/AS - auktion/ADHS -*************** -*** 2376,2381 **** ---- 2380,2386 ---- - bikupa/AEGS - bikupe/S - bikups/S -+ bil. - bil/ADGS - bila/EGIJOS - bilaga/EGOS -*************** -*** 2490,2495 **** ---- 2495,2501 ---- - Björn - björn/ADGS - Björns + bl.a. - bla/JS - black/DGS - blackout/DHS -*************** -*** 3645,3650 **** ---- 3651,3657 ---- - debut/ADHS - debutant/DHS - debutera/JMS ++ d.v.s. + dec. - december/AS - decennie/CIS - decennium/AJS -*************** -*** 4117,4122 **** ---- 4124,4130 ---- - dotterson/ADS - Douglas - dov/OPS + dr - dra/AJS - drabant/DHS - drabba/ACMNPS -*************** -*** 4315,4321 **** - duven/MS - dvala/EGJS - dvaldes/S -! dvs - dväljas/S - dväljes/S - dväljs/NS ---- 4323,4330 ---- - duven/MS - dvala/EGJS - dvaldes/S -! dvs. -! d.v.s. - dväljas/S - dväljes/S - dväljs/NS -*************** -*** 4463,4468 **** ---- 4472,4478 ---- - Ebbas - Ecuador/A - ed/ADHS -+ e.d. - Edberg/A - eder/AJMS - Edit/A -*************** -*** 4612,4617 **** ---- 4622,4628 ---- - ekorre/AEGS - ekosystem/BDS - ekosändning/ADGS ++ dvs. + e.Kr. - eksem/BDS - Eksjö/A - ekumenik/DS -*************** -*** 4825,4830 **** ---- 4836,4842 ---- - enkrona/EGS - enkät/DHS - Enköping/A ++ e.d. + enl. - enlighet/S - enligt/S - enorm/OPS -*************** -*** 4990,4995 **** ---- 5002,5008 ---- - etanol/DS - etapp/DHS - etc + etc. - etcetera/S - eten/BDS - eter/ES -*************** -*** 5334,5341 **** ---- 5347,5356 ---- - favorisera/ACDMNPS - favorit/ADHS - favör/DHS ++ f.Kr. + f.d. - fe/EFHS - feber/ES ++ f.n. ++ f.ö. + febr. - febril/MOPS - februari/AS - federal/MOS -*************** -*** 5451,5456 **** ---- 5466,5472 ---- - fiffla/ACDMNS - fifflar/DJQS - fifflare/AEJS + fig. - figur/ADHS - figurativ/OS - figurera/ACJMNPS -*************** -*** 5635,5640 **** ---- 5651,5657 ---- - fjäsk/ABS - fjäska/JMS - fjättra/CMNPS -+ f.Kr. - flack/OPS - flacka/ABCDJMNS - fladder/CS -*************** -*** 5913,5918 **** ---- 5930,5936 ---- - fortplanta/ACMNPS - fortplantning/ADGS - fortran/S ++ fil.kand. ++ fil.lic. + forts. - fortsatt/OQS - fortskrida/KS - fortsätta/AJS -*************** -*** 6075,6080 **** ---- 6093,6099 ---- - fras/DHS - frasa/BDHJMS - frasering/ADS -+ fre. - fred/ADS - freda/ACJMNPS - fredag/ADGS -*************** -*** 6170,6175 **** ---- 6189,6195 ---- - frivol/MOS - froda/ACMNPS - frodig/OS + fr.o.m. - from/KLMNS - fromhet/ADS - fromt/S -*************** -*** 6453,6458 **** ---- 6473,6479 ---- - fästman/AFS - fästmö/AEIS - fästning/ADGS -+ f.ö. - föda/ADEJKLRS - född/OQS - födelse/AES -*************** -*** 10493,10498 **** ---- 10514,10520 ---- - Jan/A - Janne/A - Janos ++ fre. + jan. - januari/AS - japan/DHS - Japans -*************** -*** 10520,10525 **** ---- 10542,10548 ---- - jetflyg/ABS - jetmotor/EHS - jetplan/ABDS + jfr - jiddisch/DS - Jimmy/A - jippo/ACES -*************** -*** 10870,10875 **** ---- 10893,10899 ---- - kaos/BS - kaotisk/OS - Kap + kap. - kap/BDS - kapa/ACJMNPS - kapabel/KMS -*************** -*** 11119,11124 **** ---- 11143,11149 ---- - Kjell/A - kjol/ADGS - kjortel/EIS + kl. - kl - klack/DGS - klacka/IJMS -*************** -*** 13445,13450 **** ---- 13470,13476 ---- - löpning/ADGS - löpsedel/AEIS - löptid/DS + lör. - lördag/ADGS - lös/AORS - lösa/ABDJKLQRS -*************** -*** 13783,13788 **** ---- 13809,13815 ---- - Mauretanien/A - Mauritius - mausoleum/JS -+ max. - max - maxim/DHS - maximal/MOS -*************** -*** 13965,13970 **** ---- 13992,13998 ---- - mexikan/DHS - mexikanska/AEGS - Mexiko/A + m.fl. - mg - MHz - Michael/A -*************** -*** 14016,14021 **** ---- 14044,14050 ---- - milslång/OS - milstolpe/AEGS - mimosa/AES -+ min. - min/ACDFHS - mina/HJS - mindervärdig/OQRS -*************** -*** 14136,14141 **** ---- 14165,14171 ---- - mjölnar/DJQS - mjölnare/AEJS - ml + m.m. - mm - mo/AEGS - mobba/ACMNPS -*************** -*** 14539,14544 **** ---- 14569,14575 ---- - målstyrd/OS - målsättning/ADGS - måltid/ADHS ++ max. ++ min. + mån. - mån/DGQS - måna/IJMPRS - månad/ADHQS -*************** -*** 14792,14797 **** ---- 14823,14830 ---- - neutron/DHS - nevö/ES - New + ngn + ngt - nia/EGJQS - Nicaragua/A - nick/DGS -*************** -*** 14920,14931 **** ---- 14953,14966 ---- - notifikation/ADS - notis/DHS - notorisk/OS + nov. - nova/AES - novell/DHS - novellmagasin/ABDS - novellsamling/ADGS - november/AS - novis/DHS + nr. - nr - nu/BS - nubb/S -*************** -*** 15243,15248 **** ---- 15278,15284 ---- - obrottslig/OS - obrukbar/MOS - obruten/MS ++ o.s.v. + obs. - obs - observant/OPS - observation/ADHS -*************** -*** 15470,15475 **** ---- 15506,15512 ---- - okonventionell/MOS - okritisk/OS - okryddade/OS + okt. - oktagon/HS - oktal/MOS - oktav/DHS -*************** -*** 15741,15746 **** ---- 15778,15784 ---- - onjutbar/MOS - onkel/AES - onormal/MOS + ons. - onsdag/ADGS - onyanserade/OS - onykter/MS -*************** -*** 15977,15983 **** ---- 16015,16023 ---- - ostrukturerade/OS - ostörd/OS - osund/OS + osv. - osv -+ o.s.v. - osvensk/OS - osviklig/OPS - osympatisk/OPQS -*************** -*** 16378,16383 **** ---- 16418,16424 ---- - petitum/ES - Petra/A - Pettersson/A + p.g.a. - pga - Philips - pi/FS -*************** -*** 17457,17462 **** ---- 17498,17504 ---- - resonabel/MS - resonemang/ABDS - resonera/ACMNS + resp. - resp/S - respekt/S - respektabel/LMS -*************** -*** 18328,18333 **** ---- 18370,18376 ---- - sentimentalitet/ADS - separat/OS - separera/ACMNPS -+ sept. - september/AS - seraf/DHS - serenad/DHS -*************** -*** 18652,18657 **** ---- 18695,18701 ---- - sjöslag/S - sjöss/S - sjåpig/OS + s.k. - ska/GJMPS - skada/ABCDEGJMNPS - skadedjur/BDS -*************** -*** 20767,20772 **** ---- 20811,20817 ---- - sömnlös/OQRS - sömnlöshet/ADS - sömnmedel/ACFS ++ sept. + sön. - söndag/ADGS - sönder/S - sönderbruten/MS -*************** -*** 20832,20837 **** ---- 20877,20883 ---- - såväl/S - såvärst/S - ta/AKRS -+ tab. - tabbe/S - tabell/DHS - tabernaklet/AS -*************** -*** 21063,21068 **** ---- 21109,21115 ---- - testar/DJQS - testare/AEJS - testning/ADGS + t.ex. - tex - Texas - text/DHOS -*************** -*** 21336,21341 **** ---- 21383,21389 ---- - tippa/ACMNPS - tips/BDS - tipsa/ACJMNPS -+ tis. - tisdag/ADGS - tistel/EIS - titan/S -*************** -*** 21463,21468 **** ---- 21511,21517 ---- - tolvårig/OS - tolvårs/S - Tom + t.o.m. - tom/LMS - Tomas - tomat/DHS -*************** -*** 21513,21518 **** ---- 21562,21568 ---- - torped/ADHS - torpedbåt/ADGS - torr/MOPS ++ tab. ++ tis. + tors. - torsdag/ADGS - torsk/DGS - Torsten/A -*************** -*** 22359,22364 **** ---- 22409,22415 ---- - uppkomst/DS - uppkoppling/ADGS - uppkrupen/MS ++ u.a. + uppl. - upplaga/AEGOS - upplagd/OS - upplage/S -*************** -*** 22639,22644 **** ---- 22690,22696 ---- - utförar/DJQS - utförare/AEJS - utförlig/OPS + utg. - utgallra/ACMNPS - utgamla/S - utgammal/MS -*************** -*** 23003,23008 **** ---- 23055,23061 ---- - varannan/S - varav/S - Varberg/A -+ vard. - varda/BDS - vardag/ADGS - vardaglig/OPS -*************** -*** 23091,23096 **** ---- 23144,23150 ---- - Vaxholm/A - vaxljus/BDS - Vaxmora -+ vd - VD - ve/GS - veck/ABDS -*************** -*** 23203,23208 **** ---- 23257,23264 ---- - vettlös/OS - vev/DS - veva/ACJMNPS + v.g. + v.g.v. - vi/ACEOS - vibration/ADHS - vibrator/AES -*************** -*** 23416,23421 **** ---- 23472,23478 ---- - VM - vokabulär/S - vokal/DHS ++ vard. ++ vd + vol. - volontär/ADHS - volt/S - Volvo/A diff --git a/runtime/syntax/yacc.vim b/runtime/syntax/yacc.vim index 147728b7e..aef02b53c 100644 --- a/runtime/syntax/yacc.vim +++ b/runtime/syntax/yacc.vim @@ -1,12 +1,12 @@ " Vim syntax file " Language: Yacc " Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz> -" Last Change: Sep 06, 2005 -" Version: 3 +" Last Change: Feb 22, 2006 +" Version: 4 " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax " " Option: -" yacc_uses_cpp : if this variable exists, then C++ is loaded rather than C +" g:yacc_uses_cpp : if this variable exists, then C++ is loaded rather than C " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -18,12 +18,12 @@ endif " Read the C syntax to start with if version >= 600 - if exists("yacc_uses_cpp") + if exists("g:yacc_uses_cpp") runtime! syntax/cpp.vim else runtime! syntax/c.vim endif -elseif exists("yacc_uses_cpp") +elseif exists("g:yacc_uses_cpp") so <sfile>:p:h/cpp.vim else so <sfile>:p:h/c.vim @@ -47,7 +47,7 @@ syn region yaccUnion contained matchgroup=yaccCurly start="{" matchgroup=yaccCur syn region yaccUnionCurly contained matchgroup=yaccCurly start="{" matchgroup=yaccCurly end="}" contains=@yaccUnionGroup syn match yaccBrkt contained "[<>]" syn match yaccType "<[a-zA-Z_][a-zA-Z0-9_]*>" contains=yaccBrkt -syn match yaccDefinition "^[A-Za-z][A-Za-z0-9_]*[ \t]*:" +syn match yaccDefinition "^[A-Za-z][A-Za-z0-9_]*\_s*:" " special Yacc separators syn match yaccSectionSep "^[ \t]*%%" diff --git a/src/Make_vms.mms b/src/Make_vms.mms index 8b8346833..8b249811c 100644 --- a/src/Make_vms.mms +++ b/src/Make_vms.mms @@ -2,7 +2,7 @@ # Makefile for Vim on OpenVMS # # Maintainer: Zoltan Arpadffy <arpadffy@polarhome.com> -# Last change: 2005 Jul 23 +# Last change: 2006 Feb 23 # # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64 # with MMS and MMK @@ -288,7 +288,7 @@ ALL_LIBS = $(LIBS) $(GUI_LIB_DIR) $(GUI_LIB) \ SRC = buffer.c charset.c diff.c digraph.c edit.c eval.c ex_cmds.c ex_cmds2.c \ ex_docmd.c ex_eval.c ex_getln.c if_xcmdsrv.c fileio.c fold.c getchar.c \ hardcopy.c hashtable.c main.c mark.c menu.c mbyte.c memfile.c memline.c message.c misc1.c \ - misc2.c move.c normal.c ops.c option.c quickfix.c regexp.c search.c \ + misc2.c move.c normal.c ops.c option.c popupmenu.c quickfix.c regexp.c search.c \ spell.c syntax.c tag.c term.c termlib.c ui.c undo.c version.c screen.c \ window.c os_unix.c os_vms.c pathdef.c \ $(GUI_SRC) $(PERL_SRC) $(PYTHON_SRC) $(TCL_SRC) $(SNIFF_SRC) \ @@ -298,7 +298,7 @@ OBJ = buffer.obj charset.obj diff.obj digraph.obj edit.obj eval.obj \ ex_cmds.obj ex_cmds2.obj ex_docmd.obj ex_eval.obj ex_getln.obj \ if_xcmdsrv.obj fileio.obj fold.obj getchar.obj hardcopy.obj hashtable.obj main.obj mark.obj \ menu.obj memfile.obj memline.obj message.obj misc1.obj misc2.obj \ - move.obj mbyte.obj normal.obj ops.obj option.obj quickfix.obj \ + move.obj mbyte.obj normal.obj ops.obj option.obj popupmenu.obj quickfix.obj \ regexp.obj search.obj spell.obj syntax.obj tag.obj term.obj termlib.obj \ ui.obj undo.obj screen.obj version.obj window.obj os_unix.obj \ os_vms.obj pathdef.obj \ @@ -607,6 +607,10 @@ pathdef.obj : pathdef.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \ gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ globals.h farsi.h arabic.h +popupmenu.obj : popupmenu.c vim.h [.auto]config.h feature.h os_unix.h \ + ascii.h keymap.h term.h macros.h structs.h regexp.h \ + gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ + globals.h farsi.h arabic.h quickfix.obj : quickfix.c vim.h [.auto]config.h feature.h os_unix.h \ ascii.h keymap.h term.h macros.h structs.h regexp.h \ gui.h gui_beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \ diff --git a/src/edit.c b/src/edit.c index d159911bb..79605666a 100644 --- a/src/edit.c +++ b/src/edit.c @@ -713,8 +713,8 @@ edit(cmdchar, startln, count) continue; } - /* A printable character: Add it to "compl_leader". */ - if (vim_isprintc(c)) + /* A printable, non-white character: Add to "compl_leader". */ + if (vim_isprintc(c) && !vim_iswhite(c)) { ins_compl_addleader(c); continue; @@ -3696,7 +3696,10 @@ ins_compl_delete() ins_compl_insert() { ins_bytes(compl_shown_match->cp_str + curwin->w_cursor.col - compl_col); - compl_used_match = TRUE; + if (compl_shown_match->cp_flags & ORIGINAL_TEXT) + compl_used_match = FALSE; + else + compl_used_match = TRUE; } /* diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index 575a185f3..416fd3e35 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -1983,7 +1983,8 @@ do_argfile(eap, argn) #endif #ifdef FEAT_WINDOWS - if (*eap->cmd == 's') /* split window first */ + /* split window or create new tab page first */ + if (*eap->cmd == 's' || cmdmod.tab != 0) { if (win_split(0, 0) == FAIL) return; diff --git a/src/ex_getln.c b/src/ex_getln.c index 6828f671d..bac600cf5 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -2939,6 +2939,14 @@ redrawcmd() if (cmd_silent) return; + /* when 'incsearch' is set there may be no command line while redrawing */ + if (ccline.cmdbuff == NULL) + { + windgoto(cmdline_row, 0); + msg_clr_eos(); + return; + } + msg_start(); redrawcmdprompt(); @@ -5635,6 +5643,9 @@ ex_window() /* Don't execute autocommands while creating the window. */ ++autocmd_block; # endif + /* don't use a new tab page */ + cmdmod.tab = 0; + /* Create a window for the command-line buffer. */ if (win_split((int)p_cwh, WSP_BOT) == FAIL) { diff --git a/src/proto/window.pro b/src/proto/window.pro index ca0de7a28..1c56ab1c1 100644 --- a/src/proto/window.pro +++ b/src/proto/window.pro @@ -14,11 +14,13 @@ void close_others __ARGS((int message, int forceit)); void curwin_init __ARGS((void)); int win_alloc_first __ARGS((void)); void win_init_size __ARGS((void)); -int win_new_tabpage __ARGS((void)); +int win_new_tabpage __ARGS((int after)); +int may_open_tabpage __ARGS((void)); int make_tabpages __ARGS((int maxcount)); int valid_tabpage __ARGS((tabpage_T *tpc)); tabpage_T *find_tabpage __ARGS((int n)); void goto_tabpage __ARGS((int n)); +void tabpage_move __ARGS((int nr)); void win_goto __ARGS((win_T *wp)); win_T *win_find_nr __ARGS((int winnr)); void win_enter __ARGS((win_T *wp, int undo_sync)); diff --git a/src/structs.h b/src/structs.h index 4d1928e89..bb02a75ea 100644 --- a/src/structs.h +++ b/src/structs.h @@ -428,6 +428,7 @@ typedef struct # endif # ifdef FEAT_WINDOWS int split; /* flags for win_split() */ + int tab; /* > 0 when ":tab" was used */ # endif # if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) int confirm; /* TRUE to invoke yes/no dialog */ diff --git a/src/syntax.c b/src/syntax.c index 45601539d..b5c346465 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -6109,7 +6109,7 @@ static char *(highlight_init_light[]) = "DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue", "DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta", "DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan", - "TabLine term=underline cterm=underline ctermbg=LightGrey gui=underline guibg=LightGrey", + "TabLine term=underline cterm=underline ctermfg=black ctermbg=LightGrey gui=underline guibg=LightGrey", NULL }; @@ -6138,7 +6138,7 @@ static char *(highlight_init_dark[]) = "DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue", "DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta", "DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan", - "TabLine term=underline cterm=underline ctermbg=DarkGrey gui=underline guibg=DarkGrey", + "TabLine term=underline cterm=underline ctermfg=white ctermbg=DarkGrey gui=underline guibg=DarkGrey", NULL }; diff --git a/src/term.c b/src/term.c index f9d6d2dd9..621d35ba2 100644 --- a/src/term.c +++ b/src/term.c @@ -4695,10 +4695,18 @@ check_termcode(max_offset, buf, buflen) && orig_num_clicks != 4 && orig_mouse_col == mouse_col && orig_mouse_row == mouse_row + && ((orig_topline == curwin->w_topline #ifdef FEAT_DIFF - && orig_topfill == curwin->w_topfill + && orig_topfill == curwin->w_topfill #endif - && orig_topline == curwin->w_topline) + ) +#ifdef FEAT_WINDOWS + /* Double click in tab pages line also works + * when window contents changes. */ + || (mouse_row == 0 && firstwin->w_winrow > 0) +#endif + ) + ) ++orig_num_clicks; else orig_num_clicks = 1; diff --git a/src/version.h b/src/version.h index 0ebd781e6..9838f1b90 100644 --- a/src/version.h +++ b/src/version.h @@ -36,5 +36,5 @@ #define VIM_VERSION_NODOT "vim70aa" #define VIM_VERSION_SHORT "7.0aa" #define VIM_VERSION_MEDIUM "7.0aa ALPHA" -#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 22)" -#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 22, compiled " +#define VIM_VERSION_LONG "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 23)" +#define VIM_VERSION_LONG_DATE "VIM - Vi IMproved 7.0aa ALPHA (2006 Feb 23, compiled " |