# HG changeset patch # User vimboss # Date 1105738974 0 # Node ID 98435a8ddb094d8ce0c437bcdaeb3b97c7a61cb1 # Parent d4f3db33d782da9d33b2715fbd14f5acac280ce0 updated for version 7.0038 diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 7.0aa. Last change: 2004 Dec 20 +*cmdline.txt* For Vim version 7.0aa. Last change: 2005 Jan 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -153,6 +153,10 @@ CTRL-R {0-9a-z"%#:-=.} *c_CTRL-R* *c '=' the expression register: you are prompted to enter an expression (see |expression|) See |registers| about registers. {not in Vi} + Implementation detail: When using the |expression| register + and invoking setcmdpos(), this sets the position before + inserting the resulting string. Use CTRL-R CTRL-R to set the + position afterwards. CTRL-R CTRL-F *c_CTRL-R_CTRL-F* *c__* CTRL-R CTRL-P *c_CTRL-R_CTRL-P* *c__* diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -1,4 +1,4 @@ -*gui.txt* For Vim version 7.0aa. Last change: 2004 Dec 29 +*gui.txt* For Vim version 7.0aa. Last change: 2005 Jan 14 VIM REFERENCE MANUAL by Bram Moolenaar @@ -144,7 +144,7 @@ window Vim is running in with this comma ============================================================================== 2. Scrollbars *gui-scrollbars* -There are vertical scrollbars and a horizontal scrollbars. You may +There are vertical scrollbars and a horizontal scrollbar. You may configure which ones appear with the 'guioptions' option. The interface looks like this (with ":set guioptions=mlrb"): @@ -203,11 +203,11 @@ scrolled as far as possible left and rig necessary, it must remain on a visible character (unless 'virtualedit' is set). -Computing the length of the longest visible takes quite a bit of computation, -and it has to be done every time something changes. If this takes too much -time or you don't like the cursor jumping to another line, include the 'h' -flag in 'guioptions'. Then the scrolling is limited by the text of the -current cursor line. +Computing the length of the longest visible line takes quite a bit of +computation, and it has to be done every time something changes. If this +takes too much time or you don't like the cursor jumping to another line, +include the 'h' flag in 'guioptions'. Then the scrolling is limited by the +text of the current cursor line. *athena-intellimouse* If you have an Intellimouse and an X server that supports using the wheel, diff --git a/runtime/keymap/polish-slash_cp852.vim b/runtime/keymap/polish-slash_cp852.vim --- a/runtime/keymap/polish-slash_cp852.vim +++ b/runtime/keymap/polish-slash_cp852.vim @@ -1,6 +1,8 @@ " Polish letters keymap for cp852 " Maintainer: HS6_06 -" Last Changed: 2005 Jan 9 +" Last Changed: 2005 Jan 12 +" Current version: 1.0.2 +" History: see polish-slash.vim " This keymap adds the special Polish letters " to an existing Latin keyboard. @@ -9,7 +11,7 @@ " instead of AltGr+{acelnosxz} you ve to use "/" followed by {acelnosxz} " short keymap name for statusline -let b:keymap_name = "polish-slash-cp852" +let b:keymap_name = "PL-slash-DOS" scriptencoding latin1 diff --git a/runtime/keymap/polish-slash_utf-8.vim b/runtime/keymap/polish-slash_utf-8.vim --- a/runtime/keymap/polish-slash_utf-8.vim +++ b/runtime/keymap/polish-slash_utf-8.vim @@ -1,6 +1,8 @@ " Polish letters keymap for utf-8 " Maintainer: HS6_06 -" Last Changed: 2005 Jan 9 +" Last Changed: 2005 Jan 12 +" Current version: 1.0.2 +" History: see polish-slash.vim " This keymap adds the special Polish letters " to an existing Latin keyboard. @@ -9,7 +11,7 @@ " instead of AltGr+{acelnosxz} you ve to use "/" followed by {acelnosxz} " short keymap name for statusline -let b:keymap_name = "polish-slash-UTF-8" +let b:keymap_name = "PL-slash-UTF" scriptencoding latin1 diff --git a/runtime/lang/menu_czech_czech_republic.1250.vim b/runtime/lang/menu_czech_czech_republic.1250.vim --- a/runtime/lang/menu_czech_czech_republic.1250.vim +++ b/runtime/lang/menu_czech_czech_republic.1250.vim @@ -38,7 +38,7 @@ menutrans &Paste"+gP V&ložit"+gP menutrans Put\ &Before[p Vložit\ &před[p menutrans Put\ &After]p Vloži&t\ za]p menutrans &Deletex &Smazatx -menutrans &Select\ allggVG Vy&brat\ všeggVG +menutrans &Select\ AllggVG Vy&brat\ všeggVG menutrans &Find\.\.\. &Hledat\.\.\. menutrans Find\ and\ Rep&lace\.\.\. &Nahradit\.\.\. menutrans Options\.\.\. Volb&y\.\.\. @@ -186,6 +186,7 @@ menutrans &How-to\ links Ho&wto menutrans &GUI &Grafické\ rozhraní menutrans &Credits &Autoři menutrans Co&pying &Licenční\ politika +menutrans &Sponsor/Register Sponzorování/&Registrace menutrans &Find\.\.\. &Hledat\.\.\. menutrans O&rphans O&siřelé\ děti menutrans &Version &Verze diff --git a/runtime/lang/menu_czech_czech_republic.ascii.vim b/runtime/lang/menu_czech_czech_republic.ascii.vim --- a/runtime/lang/menu_czech_czech_republic.ascii.vim +++ b/runtime/lang/menu_czech_czech_republic.ascii.vim @@ -38,7 +38,7 @@ menutrans &Paste"+gP V&lozit" menutrans Put\ &Before[p Vlozit\ &pred[p menutrans Put\ &After]p Vlozi&t\ za]p menutrans &Deletex &Smazatx -menutrans &Select\ allggVG Vy&brat\ vseggVG +menutrans &Select\ AllggVG Vy&brat\ vseggVG menutrans &Find\.\.\. &Hledat\.\.\. menutrans Find\ and\ Rep&lace\.\.\. &Nahradit\.\.\. menutrans Options\.\.\. Volb&y\.\.\. @@ -186,6 +186,7 @@ menutrans &How-to\ links Ho&wto menutrans &GUI &Graficke\ rozhrani menutrans &Credits &Autori menutrans Co&pying &Licencni\ politika +menutrans &Sponsor/Register Sponzorovani/&Registrace menutrans &Find\.\.\. &Hledat\.\.\. menutrans O&rphans O&sirele\ deti menutrans &Version &Verze diff --git a/src/ex_docmd.c b/src/ex_docmd.c --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -8084,6 +8084,13 @@ ex_normal(eap) ex_startinsert(eap) exarg_T *eap; { + if (eap->forceit) + { + coladvance((colnr_T)MAXCOL); + curwin->w_curswant = MAXCOL; + curwin->w_set_curswant = FALSE; + } + /* Ignore the command when already in Insert mode. Inserting an * expression register that invokes a function can do this. */ if (State & INSERT) @@ -8091,9 +8098,6 @@ ex_startinsert(eap) if (eap->forceit) { - coladvance((colnr_T)MAXCOL); - curwin->w_curswant = MAXCOL; - curwin->w_set_curswant = FALSE; if (eap->cmdidx == CMD_startinsert) restart_edit = 'a'; else diff --git a/src/globals.h b/src/globals.h --- a/src/globals.h +++ b/src/globals.h @@ -1239,7 +1239,6 @@ EXTERN char_u e_endwhile[] INIT(=N_("E17 EXTERN char_u e_endfor[] INIT(=N_("E170: Missing :endfor")); EXTERN char_u e_while[] INIT(=N_("E588: :endwhile without :while")); EXTERN char_u e_for[] INIT(=N_("E588: :endfor without :for")); -EXTERN char_u e_listreq[] INIT(=N_("E999: List required")); #endif EXTERN char_u e_exists[] INIT(=N_("E13: File exists (add ! to override)")); EXTERN char_u e_failed[] INIT(=N_("E472: Command failed")); @@ -1345,7 +1344,7 @@ EXTERN char_u e_re_damg[] INIT(=N_("E43: EXTERN char_u e_re_corr[] INIT(=N_("E44: Corrupted regexp program")); EXTERN char_u e_readonly[] INIT(=N_("E45: 'readonly' option is set (add ! to override)")); #ifdef FEAT_EVAL -EXTERN char_u e_readonlyvar[] INIT(=N_("E46: Cannot set read-only variable \"%s\"")); +EXTERN char_u e_readonlyvar[] INIT(=N_("E46: Cannot change read-only variable \"%s\"")); EXTERN char_u e_readonlysbx[] INIT(=N_("E46: Cannot set variable in the sandbox: \"%s\"")); #endif #ifdef FEAT_QUICKFIX diff --git a/src/macros.h b/src/macros.h --- a/src/macros.h +++ b/src/macros.h @@ -263,11 +263,14 @@ * multi-byte characters if needed. * mb_ptr_back(): backup a pointer to the previous character, taking care of * multi-byte characters if needed. + * MB_COPY_CHAR(f, t): copy one char from "f" to "t" and advance the pointers. */ #ifdef FEAT_MBYTE # define mb_ptr_adv(p) p += has_mbyte ? (*mb_ptr2len_check)(p) : 1 # define mb_ptr_back(s, p) p -= has_mbyte ? ((*mb_head_off)(s, p - 1) + 1) : 1 +# define MB_COPY_CHAR(f, t) if (has_mbyte) mb_copy_char(&f, &t); else *t++ = *f++ #else # define mb_ptr_adv(p) ++p # define mb_ptr_back(s, p) --p +# define MB_COPY_CHAR(f, t) *t++ = *f++ #endif diff --git a/src/vim.h b/src/vim.h --- a/src/vim.h +++ b/src/vim.h @@ -588,6 +588,7 @@ extern char *(*dyn_libintl_textdomain)(c # define OK 1 #endif #define FAIL 0 +#define NOTDONE 2 /* not OK or FAIL but skipped */ /* flags for b_flags */ #define BF_RECOVERED 0x01 /* buffer has been recovered */