summaryrefslogtreecommitdiff
path: root/src/normal.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-19 17:43:09 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-19 17:43:09 +0100
commit32526b3c1846025f0e655f41efd4e5428da16b6c (patch)
treee9f3ea5e0daaada049e905b5f1b38b4a45511f3d /src/normal.c
parentd383c92ec1d14ffd5c3802f0ffd763e91d547fa8 (diff)
downloadvim-git-32526b3c1846025f0e655f41efd4e5428da16b6c.tar.gz
patch 8.1.0779: argument for message functions is inconsistentv8.1.0779
Problem: Argument for message functions is inconsistent. Solution: Make first argument to msg() "char *".
Diffstat (limited to 'src/normal.c')
-rw-r--r--src/normal.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/normal.c b/src/normal.c
index b7bd864c0..157acbc1f 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1207,7 +1207,7 @@ getcount:
update_screen(0);
/* now reset it, otherwise it's put in the history again */
keep_msg = kmsg;
- msg_attr(kmsg, keep_msg_attr);
+ msg_attr((char *)kmsg, keep_msg_attr);
vim_free(kmsg);
}
setcursor();
@@ -3274,7 +3274,7 @@ check_visual_highlight(void)
if (full_screen)
{
if (!did_check && HL_ATTR(HLF_V) == 0)
- MSG(_("Warning: terminal cannot highlight"));
+ msg(_("Warning: terminal cannot highlight"));
did_check = TRUE;
}
}
@@ -6468,7 +6468,7 @@ nv_brackets(cmdarg_T *cap)
cap->oap->inclusive = FALSE;
old_pos = curwin->w_cursor;
#ifdef FEAT_VIRTUALEDIT
- curwin->w_cursor.coladd = 0; /* TODO: don't do this for an error. */
+ curwin->w_cursor.coladd = 0; // TODO: don't do this for an error.
#endif
#ifdef FEAT_SEARCHPATH
@@ -6491,11 +6491,11 @@ nv_brackets(cmdarg_T *cap)
* define "]d" "[d" "]D" "[D" "]^D" "[^D"
*/
if (vim_strchr((char_u *)
-#ifdef EBCDIC
+# ifdef EBCDIC
"iI\005dD\067",
-#else
+# else
"iI\011dD\004",
-#endif
+# endif
cap->nchar) != NULL)
{
char_u *ptr;
@@ -9027,7 +9027,7 @@ nv_esc(cmdarg_T *cap)
#endif
&& !VIsual_active
&& no_reason)
- MSG(_("Type :qa! and press <Enter> to abandon all changes and exit Vim"));
+ msg(_("Type :qa! and press <Enter> to abandon all changes and exit Vim"));
/* Don't reset "restart_edit" when 'insertmode' is set, it won't be
* set again below when halfway a mapping. */