Mercurial > vim
comparison src/evalfunc.c @ 14748:00da090af0ab v8.1.0386
patch 8.1.0386: cannot test with non-default option value
commit https://github.com/vim/vim/commit/fe8ef98dd1d0b7d296d7db29b1e2fd1b56b788de
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Sep 13 20:31:54 2018 +0200
patch 8.1.0386: cannot test with non-default option value
Problem: Cannot test with non-default option value.
Solution: Add test_option_not_set().
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 13 Sep 2018 20:45:05 +0200 |
parents | 193471015e1a |
children | c54f69fabee9 |
comparison
equal
deleted
inserted
replaced
14747:5d8362ca850a | 14748:00da090af0ab |
---|---|
413 static void f_tagfiles(typval_T *argvars, typval_T *rettv); | 413 static void f_tagfiles(typval_T *argvars, typval_T *rettv); |
414 static void f_tempname(typval_T *argvars, typval_T *rettv); | 414 static void f_tempname(typval_T *argvars, typval_T *rettv); |
415 static void f_test_alloc_fail(typval_T *argvars, typval_T *rettv); | 415 static void f_test_alloc_fail(typval_T *argvars, typval_T *rettv); |
416 static void f_test_autochdir(typval_T *argvars, typval_T *rettv); | 416 static void f_test_autochdir(typval_T *argvars, typval_T *rettv); |
417 static void f_test_feedinput(typval_T *argvars, typval_T *rettv); | 417 static void f_test_feedinput(typval_T *argvars, typval_T *rettv); |
418 static void f_test_option_not_set(typval_T *argvars, typval_T *rettv); | |
418 static void f_test_override(typval_T *argvars, typval_T *rettv); | 419 static void f_test_override(typval_T *argvars, typval_T *rettv); |
419 static void f_test_garbagecollect_now(typval_T *argvars, typval_T *rettv); | 420 static void f_test_garbagecollect_now(typval_T *argvars, typval_T *rettv); |
420 static void f_test_ignore_error(typval_T *argvars, typval_T *rettv); | 421 static void f_test_ignore_error(typval_T *argvars, typval_T *rettv); |
421 #ifdef FEAT_JOB_CHANNEL | 422 #ifdef FEAT_JOB_CHANNEL |
422 static void f_test_null_channel(typval_T *argvars, typval_T *rettv); | 423 static void f_test_null_channel(typval_T *argvars, typval_T *rettv); |
920 {"test_null_job", 0, 0, f_test_null_job}, | 921 {"test_null_job", 0, 0, f_test_null_job}, |
921 #endif | 922 #endif |
922 {"test_null_list", 0, 0, f_test_null_list}, | 923 {"test_null_list", 0, 0, f_test_null_list}, |
923 {"test_null_partial", 0, 0, f_test_null_partial}, | 924 {"test_null_partial", 0, 0, f_test_null_partial}, |
924 {"test_null_string", 0, 0, f_test_null_string}, | 925 {"test_null_string", 0, 0, f_test_null_string}, |
926 {"test_option_not_set", 1, 1, f_test_option_not_set}, | |
925 {"test_override", 2, 2, f_test_override}, | 927 {"test_override", 2, 2, f_test_override}, |
926 {"test_settime", 1, 1, f_test_settime}, | 928 {"test_settime", 1, 1, f_test_settime}, |
927 #ifdef FEAT_TIMERS | 929 #ifdef FEAT_TIMERS |
928 {"timer_info", 0, 1, f_timer_info}, | 930 {"timer_info", 0, 1, f_timer_info}, |
929 {"timer_pause", 2, 2, f_timer_pause}, | 931 {"timer_pause", 2, 2, f_timer_pause}, |
13060 } | 13062 } |
13061 #endif | 13063 #endif |
13062 } | 13064 } |
13063 | 13065 |
13064 /* | 13066 /* |
13065 * "test_disable({name}, {val})" function | 13067 * "test_option_not_set({name})" function |
13068 */ | |
13069 static void | |
13070 f_test_option_not_set(typval_T *argvars, typval_T *rettv UNUSED) | |
13071 { | |
13072 char_u *name = (char_u *)""; | |
13073 | |
13074 if (argvars[0].v_type != VAR_STRING) | |
13075 EMSG(_(e_invarg)); | |
13076 else | |
13077 { | |
13078 name = get_tv_string_chk(&argvars[0]); | |
13079 if (reset_option_was_set(name) == FAIL) | |
13080 EMSG2(_(e_invarg2), name); | |
13081 } | |
13082 } | |
13083 | |
13084 /* | |
13085 * "test_override({name}, {val})" function | |
13066 */ | 13086 */ |
13067 static void | 13087 static void |
13068 f_test_override(typval_T *argvars, typval_T *rettv UNUSED) | 13088 f_test_override(typval_T *argvars, typval_T *rettv UNUSED) |
13069 { | 13089 { |
13070 char_u *name = (char_u *)""; | 13090 char_u *name = (char_u *)""; |