diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-04-25 18:24:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-04-25 18:24:29 +0200 |
| commit | b429cdeb6e62f24b50af2dcde1275e1087ee3302 (patch) | |
| tree | d1f3fdf22a99cc366cabc44c57bfdc2aca86f47d | |
| parent | 8218f60b610a004c17a5f74bcc6a1187f6fc4e75 (diff) | |
updated for version 7.3.508v7.3.508
Problem: Default for v:register is not set.
Solution: Init v:register in eval_init(). Correct for 'clipboard' before the
main loop. (Ingo Karkat)
| -rw-r--r-- | src/eval.c | 1 | ||||
| -rw-r--r-- | src/main.c | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 33b1947570..4d45ae2574 100644 --- a/src/eval.c +++ b/src/eval.c @@ -880,6 +880,7 @@ eval_init() hash_add(&compat_hashtab, p->vv_di.di_key); } set_vim_var_nr(VV_SEARCHFORWARD, 1L); + set_reg_var(0); /* default for v:register is not 0 but '"' */ #ifdef EBCDIC /* diff --git a/src/main.c b/src/main.c index 1a7e7b1feb..e1573a0dfb 100644 --- a/src/main.c +++ b/src/main.c @@ -928,6 +928,18 @@ int vim_main2(int argc, char **argv) TIME_MSG("VimEnter autocommands"); #endif +#if defined(FEAT_EVAL) && defined(FEAT_CLIPBOARD) + /* Adjust default register name for "unnamed" in 'clipboard'. Can only be + * done after the clipboard is available and all initial commands that may + * modify the 'clipboard' setting have run; i.e. just before entering the + * main loop. */ + { + int default_regname = 0; + adjust_clip_reg(&default_regname); + set_reg_var(default_regname); + } +#endif + #if defined(FEAT_DIFF) && defined(FEAT_SCROLLBIND) /* When a startup script or session file setup for diff'ing and * scrollbind, sync the scrollbind now. */ @@ -1357,7 +1369,7 @@ getout(exitval) { apply_autocmds(EVENT_BUFWINLEAVE, buf->b_fname, buf->b_fname, FALSE, buf); - buf->b_changedtick = -1; /* note that we did it already */ + buf->b_changedtick = -1; /* note that we did it already */ /* start all over, autocommands may mess up the lists */ next_tp = first_tabpage; break; diff --git a/src/version.c b/src/version.c index f4ef82523f..7e77f9a83b 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 508, +/**/ 507, /**/ 506, |