Mercurial > vim
diff src/eval.c @ 9240:636cfa97200e v7.4.1903
commit https://github.com/vim/vim/commit/45d2eeaad66939348893b9254171067b0457cd9d
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jun 6 21:07:52 2016 +0200
patch 7.4.1903
Problem: When writing viminfo merging current history with history in
viminfo may drop recent history entries.
Solution: Add new format for viminfo lines, use it for history entries. Use
a timestamp for ordering the entries. Add test_settime().
Add the viminfo version. Does not do merging on timestamp yet.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 06 Jun 2016 21:15:07 +0200 |
| parents | 6c4d610fce0a |
| children | f094d4085014 |
line wrap: on
line diff
--- a/src/eval.c +++ b/src/eval.c @@ -820,6 +820,7 @@ static void f_test_null_job(typval_T *ar static void f_test_null_list(typval_T *argvars, typval_T *rettv); static void f_test_null_partial(typval_T *argvars, typval_T *rettv); static void f_test_null_string(typval_T *argvars, typval_T *rettv); +static void f_test_settime(typval_T *argvars, typval_T *rettv); #ifdef FEAT_FLOAT static void f_tan(typval_T *argvars, typval_T *rettv); static void f_tanh(typval_T *argvars, typval_T *rettv); @@ -8809,13 +8810,14 @@ static struct fst #ifdef FEAT_JOB_CHANNEL {"test_null_channel", 0, 0, f_test_null_channel}, #endif - {"test_null_dict", 0, 0, f_test_null_dict}, + {"test_null_dict", 0, 0, f_test_null_dict}, #ifdef FEAT_JOB_CHANNEL - {"test_null_job", 0, 0, f_test_null_job}, -#endif - {"test_null_list", 0, 0, f_test_null_list}, + {"test_null_job", 0, 0, f_test_null_job}, +#endif + {"test_null_list", 0, 0, f_test_null_list}, {"test_null_partial", 0, 0, f_test_null_partial}, {"test_null_string", 0, 0, f_test_null_string}, + {"test_settime", 1, 1, f_test_settime}, #ifdef FEAT_TIMERS {"timer_start", 2, 3, f_timer_start}, {"timer_stop", 1, 1, f_timer_stop}, @@ -20849,7 +20851,7 @@ f_test_garbagecollect_now(typval_T *argv #ifdef FEAT_JOB_CHANNEL static void -f_test_null_channel(typval_T *argvars UNUSED, typval_T *rettv UNUSED) +f_test_null_channel(typval_T *argvars UNUSED, typval_T *rettv) { rettv->v_type = VAR_CHANNEL; rettv->vval.v_channel = NULL; @@ -20857,7 +20859,7 @@ f_test_null_channel(typval_T *argvars UN #endif static void -f_test_null_dict(typval_T *argvars UNUSED, typval_T *rettv UNUSED) +f_test_null_dict(typval_T *argvars UNUSED, typval_T *rettv) { rettv->v_type = VAR_DICT; rettv->vval.v_dict = NULL; @@ -20865,7 +20867,7 @@ f_test_null_dict(typval_T *argvars UNUSE #ifdef FEAT_JOB_CHANNEL static void -f_test_null_job(typval_T *argvars UNUSED, typval_T *rettv UNUSED) +f_test_null_job(typval_T *argvars UNUSED, typval_T *rettv) { rettv->v_type = VAR_JOB; rettv->vval.v_job = NULL; @@ -20873,26 +20875,32 @@ f_test_null_job(typval_T *argvars UNUSED #endif static void -f_test_null_list(typval_T *argvars UNUSED, typval_T *rettv UNUSED) +f_test_null_list(typval_T *argvars UNUSED, typval_T *rettv) { rettv->v_type = VAR_LIST; rettv->vval.v_list = NULL; } static void -f_test_null_partial(typval_T *argvars UNUSED, typval_T *rettv UNUSED) +f_test_null_partial(typval_T *argvars UNUSED, typval_T *rettv) { rettv->v_type = VAR_PARTIAL; rettv->vval.v_partial = NULL; } static void -f_test_null_string(typval_T *argvars UNUSED, typval_T *rettv UNUSED) +f_test_null_string(typval_T *argvars UNUSED, typval_T *rettv) { rettv->v_type = VAR_STRING; rettv->vval.v_string = NULL; } + static void +f_test_settime(typval_T *argvars, typval_T *rettv UNUSED) +{ + time_for_testing = (time_t)get_tv_number(&argvars[0]); +} + #if defined(FEAT_JOB_CHANNEL) || defined(FEAT_TIMERS) || defined(PROTO) /* * Get a callback from "arg". It can be a Funcref or a function name.