Mercurial > vim
comparison src/dict.c @ 21789:f84625b961a8 v8.2.1444
patch 8.2.1444: error messages are spread out and names can be confusing
Commit: https://github.com/vim/vim/commit/bc4c505166dc82911553206bb0c2133c6ac94aa1
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Aug 13 22:47:35 2020 +0200
patch 8.2.1444: error messages are spread out and names can be confusing
Problem: Error messages are spread out and names can be confusing.
Solution: Start moving error messages to a separate file and use clear
names.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 13 Aug 2020 23:00:04 +0200 |
parents | 703ea7603d3e |
children | 1f6dc5b953c4 |
comparison
equal
deleted
inserted
replaced
21788:acd6c7f8b633 | 21789:f84625b961a8 |
---|---|
845 if (**arg != ':') | 845 if (**arg != ':') |
846 { | 846 { |
847 if (evaluate) | 847 if (evaluate) |
848 { | 848 { |
849 if (*skipwhite(*arg) == ':') | 849 if (*skipwhite(*arg) == ':') |
850 semsg(_(e_no_white_before), ":"); | 850 semsg(_(e_no_white_space_allowed_before), ":"); |
851 else | 851 else |
852 semsg(_(e_missing_dict_colon), *arg); | 852 semsg(_(e_missing_dict_colon), *arg); |
853 } | 853 } |
854 clear_tv(&tvkey); | 854 clear_tv(&tvkey); |
855 goto failret; | 855 goto failret; |
864 goto failret; | 864 goto failret; |
865 } | 865 } |
866 } | 866 } |
867 if (vim9script && (*arg)[1] != NUL && !VIM_ISWHITE((*arg)[1])) | 867 if (vim9script && (*arg)[1] != NUL && !VIM_ISWHITE((*arg)[1])) |
868 { | 868 { |
869 semsg(_(e_white_after), ":"); | 869 semsg(_(e_white_space_required_after), ":"); |
870 clear_tv(&tvkey); | 870 clear_tv(&tvkey); |
871 goto failret; | 871 goto failret; |
872 } | 872 } |
873 | 873 |
874 *arg = skipwhite_and_linebreak(*arg + 1, evalarg); | 874 *arg = skipwhite_and_linebreak(*arg + 1, evalarg); |
907 had_comma = **arg == ','; | 907 had_comma = **arg == ','; |
908 if (had_comma) | 908 if (had_comma) |
909 { | 909 { |
910 if (vim9script && (*arg)[1] != NUL && !VIM_ISWHITE((*arg)[1])) | 910 if (vim9script && (*arg)[1] != NUL && !VIM_ISWHITE((*arg)[1])) |
911 { | 911 { |
912 semsg(_(e_white_after), ","); | 912 semsg(_(e_white_space_required_after), ","); |
913 goto failret; | 913 goto failret; |
914 } | 914 } |
915 *arg = skipwhite(*arg + 1); | 915 *arg = skipwhite(*arg + 1); |
916 } | 916 } |
917 | 917 |
922 if (!had_comma) | 922 if (!had_comma) |
923 { | 923 { |
924 if (evaluate) | 924 if (evaluate) |
925 { | 925 { |
926 if (**arg == ',') | 926 if (**arg == ',') |
927 semsg(_(e_no_white_before), ","); | 927 semsg(_(e_no_white_space_allowed_before), ","); |
928 else | 928 else |
929 semsg(_(e_missing_dict_comma), *arg); | 929 semsg(_(e_missing_dict_comma), *arg); |
930 } | 930 } |
931 goto failret; | 931 goto failret; |
932 } | 932 } |