diff options
| author | James McCoy <jamessan@jamessan.com> | 2021-10-18 09:08:46 -0400 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2021-11-01 06:41:28 -0400 |
| commit | efa924f66b183d9cf2404ce91c4f009c27e0515a (patch) | |
| tree | adc8c74cba88e76c2ae0548cd6e9b01804da9933 /src/nvim/path.c | |
| parent | 684640f5518a483cf2bc48efc8f68449379cef69 (diff) | |
| download | rneovim-efa924f66b183d9cf2404ce91c4f009c27e0515a.tar.gz rneovim-efa924f66b183d9cf2404ce91c4f009c27e0515a.tar.bz2 rneovim-efa924f66b183d9cf2404ce91c4f009c27e0515a.zip | |
vim-patch:8.1.0743: giving error messages is not flexible
Problem: Giving error messages is not flexible.
Solution: Add semsg(). Change argument from "char_u *" to "char *", also
for msg() and get rid of most MSG macros. (Ozaki Kiichi, closes
vim/vim#3302) Also make emsg() accept a "char *" argument. Get rid of
an enormous number of type casts.
https://github.com/vim/vim/commit/f9e3e09fdc93be9f0d47afbc6c7df1188c2a5a0d
Diffstat (limited to 'src/nvim/path.c')
| -rw-r--r-- | src/nvim/path.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/path.c b/src/nvim/path.c index 2a80079817..6f0f715a25 100644 --- a/src/nvim/path.c +++ b/src/nvim/path.c @@ -1701,7 +1701,7 @@ char_u *find_file_name_in_path(char_u *ptr, size_t len, int options, long count, if (file_name == NULL && (options & FNAME_MESS)) { char_u c = ptr[len]; ptr[len] = NUL; - EMSG2(_("E447: Can't find file \"%s\" in path"), ptr); + semsg(_("E447: Can't find file \"%s\" in path"), ptr); ptr[len] = c; } @@ -2081,7 +2081,7 @@ int expand_wildcards_eval(char_u **pat, int *num_file, char_u ***file, int flags int ret = FAIL; char_u *eval_pat = NULL; char_u *exp_pat = *pat; - char_u *ignored_msg; + char *ignored_msg; size_t usedlen; if (*exp_pat == '%' || *exp_pat == '#' || *exp_pat == '<') { @@ -2257,7 +2257,7 @@ int path_full_dir_name(char *directory, char *buffer, size_t len) if (os_chdir(old_dir) != SUCCESS) { // That shouldn't happen, since we've tested if it works. retval = FAIL; - EMSG(_(e_prev_dir)); + emsg(_(e_prev_dir)); } return retval; |