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/cursor_shape.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/cursor_shape.c')
| -rw-r--r-- | src/nvim/cursor_shape.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nvim/cursor_shape.c b/src/nvim/cursor_shape.c index 18cade1052..644bb2c324 100644 --- a/src/nvim/cursor_shape.c +++ b/src/nvim/cursor_shape.c @@ -93,7 +93,7 @@ Array mode_style_array(void) /// @param what SHAPE_CURSOR or SHAPE_MOUSE ('mouseshape') /// /// @returns error message for an illegal option, NULL otherwise. -char_u *parse_shape_opt(int what) +char *parse_shape_opt(int what) { char_u *modep; char_u *colonp; @@ -126,10 +126,10 @@ char_u *parse_shape_opt(int what) commap = vim_strchr(modep, ','); if (colonp == NULL || (commap != NULL && commap < colonp)) { - return (char_u *)N_("E545: Missing colon"); + return N_("E545: Missing colon"); } if (colonp == modep) { - return (char_u *)N_("E546: Illegal mode"); + return N_("E546: Illegal mode"); } // Repeat for all modes before the colon. @@ -154,7 +154,7 @@ char_u *parse_shape_opt(int what) } if (idx == SHAPE_IDX_COUNT || (shape_table[idx].used_for & what) == 0) { - return (char_u *)N_("E546: Illegal mode"); + return N_("E546: Illegal mode"); } if (len == 2 && modep[0] == 'v' && modep[1] == 'e') { found_ve = true; @@ -189,12 +189,12 @@ char_u *parse_shape_opt(int what) if (len != 0) { p += len; if (!ascii_isdigit(*p)) { - return (char_u *)N_("E548: digit expected"); + return N_("E548: digit expected"); } int n = getdigits_int(&p, false, 0); if (len == 3) { // "ver" or "hor" if (n == 0) { - return (char_u *)N_("E549: Illegal percentage"); + return N_("E549: Illegal percentage"); } if (round == 2) { if (TOLOWER_ASC(i) == 'v') { |