Mercurial > vim

comparison src/sign.c @ 26877:06a137af96f8 v8.2.3967

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3967: error messages are spread out Commit: https://github.com/vim/vim/commit/460ae5dfca31fa627531c263184849976755cf6b Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jan 1 14:19:49 2022 +0000 patch 8.2.3967: error messages are spread out Problem: Error messages are spread out. Solution: Move more errors to errors.h.
author Bram Moolenaar <Bram@vim.org>
date Sat, 01 Jan 2022 15:30:05 +0100
parents bce848ec8b1b
children 7f150a4936f2
comparison
equal deleted inserted replaced
26876:601a973ac16c 26877:06a137af96f8
2312 { 2312 {
2313 retval = -1; 2313 retval = -1;
2314 if (li->li_tv.v_type == VAR_DICT) 2314 if (li->li_tv.v_type == VAR_DICT)
2315 retval = sign_define_from_dict(NULL, li->li_tv.vval.v_dict); 2315 retval = sign_define_from_dict(NULL, li->li_tv.vval.v_dict);
2316 else 2316 else
2317 emsg(_(e_dictreq)); 2317 emsg(_(e_dictionary_required));
2318 list_append_number(retlist, retval); 2318 list_append_number(retlist, retval);
2319 } 2319 }
2320 } 2320 }
2321 2321
2322 /* 2322 /*
2349 if (name == NULL) 2349 if (name == NULL)
2350 return; 2350 return;
2351 2351
2352 if (argvars[1].v_type != VAR_UNKNOWN && argvars[1].v_type != VAR_DICT) 2352 if (argvars[1].v_type != VAR_UNKNOWN && argvars[1].v_type != VAR_DICT)
2353 { 2353 {
2354 emsg(_(e_dictreq)); 2354 emsg(_(e_dictionary_required));
2355 return; 2355 return;
2356 } 2356 }
2357 2357
2358 rettv->vval.v_number = sign_define_from_dict(name, 2358 rettv->vval.v_number = sign_define_from_dict(name,
2359 argvars[1].v_type == VAR_DICT ? argvars[1].vval.v_dict : NULL); 2359 argvars[1].v_type == VAR_DICT ? argvars[1].vval.v_dict : NULL);
2412 if (argvars[1].v_type != VAR_UNKNOWN) 2412 if (argvars[1].v_type != VAR_UNKNOWN)
2413 { 2413 {
2414 if (argvars[1].v_type != VAR_DICT || 2414 if (argvars[1].v_type != VAR_DICT ||
2415 ((dict = argvars[1].vval.v_dict) == NULL)) 2415 ((dict = argvars[1].vval.v_dict) == NULL))
2416 { 2416 {
2417 emsg(_(e_dictreq)); 2417 emsg(_(e_dictionary_required));
2418 return; 2418 return;
2419 } 2419 }
2420 if ((di = dict_find(dict, (char_u *)"lnum", -1)) != NULL) 2420 if ((di = dict_find(dict, (char_u *)"lnum", -1)) != NULL)
2421 { 2421 {
2422 // get signs placed at this line 2422 // get signs placed at this line
2642 2642
2643 if (argvars[4].v_type != VAR_UNKNOWN 2643 if (argvars[4].v_type != VAR_UNKNOWN
2644 && (argvars[4].v_type != VAR_DICT 2644 && (argvars[4].v_type != VAR_DICT
2645 || ((dict = argvars[4].vval.v_dict) == NULL))) 2645 || ((dict = argvars[4].vval.v_dict) == NULL)))
2646 { 2646 {
2647 emsg(_(e_dictreq)); 2647 emsg(_(e_dictionary_required));
2648 return; 2648 return;
2649 } 2649 }
2650 2650
2651 rettv->vval.v_number = sign_place_from_dict(&argvars[0], &argvars[1], 2651 rettv->vval.v_number = sign_place_from_dict(&argvars[0], &argvars[1],
2652 &argvars[2], &argvars[3], dict); 2652 &argvars[2], &argvars[3], dict);
2667 if (in_vim9script() && check_for_list_arg(argvars, 0) == FAIL) 2667 if (in_vim9script() && check_for_list_arg(argvars, 0) == FAIL)
2668 return; 2668 return;
2669 2669
2670 if (argvars[0].v_type != VAR_LIST) 2670 if (argvars[0].v_type != VAR_LIST)
2671 { 2671 {
2672 emsg(_(e_listreq)); 2672 emsg(_(e_list_required));
2673 return; 2673 return;
2674 } 2674 }
2675 2675
2676 // Process the List of sign attributes 2676 // Process the List of sign attributes
2677 FOR_ALL_LIST_ITEMS(argvars[0].vval.v_list, li) 2677 FOR_ALL_LIST_ITEMS(argvars[0].vval.v_list, li)
2679 sign_id = -1; 2679 sign_id = -1;
2680 if (li->li_tv.v_type == VAR_DICT) 2680 if (li->li_tv.v_type == VAR_DICT)
2681 sign_id = sign_place_from_dict(NULL, NULL, NULL, NULL, 2681 sign_id = sign_place_from_dict(NULL, NULL, NULL, NULL,
2682 li->li_tv.vval.v_dict); 2682 li->li_tv.vval.v_dict);
2683 else 2683 else
2684 emsg(_(e_dictreq)); 2684 emsg(_(e_dictionary_required));
2685 list_append_number(rettv->vval.v_list, sign_id); 2685 list_append_number(rettv->vval.v_list, sign_id);
2686 } 2686 }
2687 } 2687 }
2688 2688
2689 /* 2689 /*
2872 2872
2873 if (argvars[1].v_type != VAR_UNKNOWN) 2873 if (argvars[1].v_type != VAR_UNKNOWN)
2874 { 2874 {
2875 if (argvars[1].v_type != VAR_DICT) 2875 if (argvars[1].v_type != VAR_DICT)
2876 { 2876 {
2877 emsg(_(e_dictreq)); 2877 emsg(_(e_dictionary_required));
2878 return; 2878 return;
2879 } 2879 }
2880 dict = argvars[1].vval.v_dict; 2880 dict = argvars[1].vval.v_dict;
2881 } 2881 }
2882 2882
2898 if (in_vim9script() && check_for_list_arg(argvars, 0) == FAIL) 2898 if (in_vim9script() && check_for_list_arg(argvars, 0) == FAIL)
2899 return; 2899 return;
2900 2900
2901 if (argvars[0].v_type != VAR_LIST) 2901 if (argvars[0].v_type != VAR_LIST)
2902 { 2902 {
2903 emsg(_(e_listreq)); 2903 emsg(_(e_list_required));
2904 return; 2904 return;
2905 } 2905 }
2906 2906
2907 FOR_ALL_LIST_ITEMS(argvars[0].vval.v_list, li) 2907 FOR_ALL_LIST_ITEMS(argvars[0].vval.v_list, li)
2908 { 2908 {
2909 retval = -1; 2909 retval = -1;
2910 if (li->li_tv.v_type == VAR_DICT) 2910 if (li->li_tv.v_type == VAR_DICT)
2911 retval = sign_unplace_from_dict(NULL, li->li_tv.vval.v_dict); 2911 retval = sign_unplace_from_dict(NULL, li->li_tv.vval.v_dict);
2912 else 2912 else
2913 emsg(_(e_dictreq)); 2913 emsg(_(e_dictionary_required));
2914 list_append_number(rettv->vval.v_list, retval); 2914 list_append_number(rettv->vval.v_list, retval);
2915 } 2915 }
2916 } 2916 }
2917 2917
2918 #endif // FEAT_SIGNS 2918 #endif // FEAT_SIGNS