Mercurial > vim
comparison src/option.c @ 11127:506f5d8b7d8b v8.0.0451
patch 8.0.0451: some macros are in lower case
commit https://github.com/vim/vim/commit/91acfffc1e6c0d8c2abfb186a0e79a5bf19c3f3f
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 12 19:22:36 2017 +0100
patch 8.0.0451: some macros are in lower case
Problem: Some macros are in lower case.
Solution: Make a few more macros upper case. Avoid lower case macros use an
argument twice.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 12 Mar 2017 19:30:05 +0100 |
| parents | 778c10516955 |
| children | f4ea50924c6d |
comparison
equal
deleted
inserted
replaced
| 11126:48599a3eae0b | 11127:506f5d8b7d8b |
|---|---|
| 6783 { | 6783 { |
| 6784 for (s = p_sbr; *s; ) | 6784 for (s = p_sbr; *s; ) |
| 6785 { | 6785 { |
| 6786 if (ptr2cells(s) != 1) | 6786 if (ptr2cells(s) != 1) |
| 6787 errmsg = (char_u *)N_("E595: contains unprintable or wide character"); | 6787 errmsg = (char_u *)N_("E595: contains unprintable or wide character"); |
| 6788 mb_ptr_adv(s); | 6788 MB_PTR_ADV(s); |
| 6789 } | 6789 } |
| 6790 } | 6790 } |
| 6791 #endif | 6791 #endif |
| 6792 | 6792 |
| 6793 #ifdef FEAT_GUI | 6793 #ifdef FEAT_GUI |
| 11664 } | 11664 } |
| 11665 | 11665 |
| 11666 #ifdef BACKSLASH_IN_FILENAME | 11666 #ifdef BACKSLASH_IN_FILENAME |
| 11667 /* For MS-Windows et al. we don't double backslashes at the start and | 11667 /* For MS-Windows et al. we don't double backslashes at the start and |
| 11668 * before a file name character. */ | 11668 * before a file name character. */ |
| 11669 for (var = buf; *var != NUL; mb_ptr_adv(var)) | 11669 for (var = buf; *var != NUL; MB_PTR_ADV(var)) |
| 11670 if (var[0] == '\\' && var[1] == '\\' | 11670 if (var[0] == '\\' && var[1] == '\\' |
| 11671 && expand_option_idx >= 0 | 11671 && expand_option_idx >= 0 |
| 11672 && (options[expand_option_idx].flags & P_EXPAND) | 11672 && (options[expand_option_idx].flags & P_EXPAND) |
| 11673 && vim_isfilec(var[2]) | 11673 && vim_isfilec(var[2]) |
| 11674 && (var[2] != '\\' || (var == buf && var[4] != '\\'))) | 11674 && (var[2] != '\\' || (var == buf && var[4] != '\\'))) |
| 11864 langmap_init(); /* back to one-to-one map */ | 11864 langmap_init(); /* back to one-to-one map */ |
| 11865 | 11865 |
| 11866 for (p = p_langmap; p[0] != NUL; ) | 11866 for (p = p_langmap; p[0] != NUL; ) |
| 11867 { | 11867 { |
| 11868 for (p2 = p; p2[0] != NUL && p2[0] != ',' && p2[0] != ';'; | 11868 for (p2 = p; p2[0] != NUL && p2[0] != ',' && p2[0] != ';'; |
| 11869 mb_ptr_adv(p2)) | 11869 MB_PTR_ADV(p2)) |
| 11870 { | 11870 { |
| 11871 if (p2[0] == '\\' && p2[1] != NUL) | 11871 if (p2[0] == '\\' && p2[1] != NUL) |
| 11872 ++p2; | 11872 ++p2; |
| 11873 } | 11873 } |
| 11874 if (p2[0] == ';') | 11874 if (p2[0] == ';') |
| 11890 from = p[0]; | 11890 from = p[0]; |
| 11891 #endif | 11891 #endif |
| 11892 to = NUL; | 11892 to = NUL; |
| 11893 if (p2 == NULL) | 11893 if (p2 == NULL) |
| 11894 { | 11894 { |
| 11895 mb_ptr_adv(p); | 11895 MB_PTR_ADV(p); |
| 11896 if (p[0] != ',') | 11896 if (p[0] != ',') |
| 11897 { | 11897 { |
| 11898 if (p[0] == '\\') | 11898 if (p[0] == '\\') |
| 11899 ++p; | 11899 ++p; |
| 11900 #ifdef FEAT_MBYTE | 11900 #ifdef FEAT_MBYTE |
| 11930 else | 11930 else |
| 11931 #endif | 11931 #endif |
| 11932 langmap_mapchar[from & 255] = to; | 11932 langmap_mapchar[from & 255] = to; |
| 11933 | 11933 |
| 11934 /* Advance to next pair */ | 11934 /* Advance to next pair */ |
| 11935 mb_ptr_adv(p); | 11935 MB_PTR_ADV(p); |
| 11936 if (p2 != NULL) | 11936 if (p2 != NULL) |
| 11937 { | 11937 { |
| 11938 mb_ptr_adv(p2); | 11938 MB_PTR_ADV(p2); |
| 11939 if (*p == ';') | 11939 if (*p == ';') |
| 11940 { | 11940 { |
| 11941 p = p2; | 11941 p = p2; |
| 11942 if (p[0] != NUL) | 11942 if (p[0] != NUL) |
| 11943 { | 11943 { |