Mercurial > vim
diff src/getchar.c @ 15543:dd725a8ab112 v8.1.0779
patch 8.1.0779: argument for message functions is inconsistent
commit https://github.com/vim/vim/commit/32526b3c1846025f0e655f41efd4e5428da16b6c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 19 17:43:09 2019 +0100
patch 8.1.0779: argument for message functions is inconsistent
Problem: Argument for message functions is inconsistent.
Solution: Make first argument to msg() "char *".
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 19 Jan 2019 17:45:07 +0100 |
parents | 55ccc2d353bd |
children | d89c5b339c2a |
line wrap: on
line diff
--- a/src/getchar.c +++ b/src/getchar.c @@ -1942,7 +1942,7 @@ vungetc(int c) } /* - * Get a character: + * Get a byte: * 1. from the stuffbuffer * This is used for abbreviated commands like "D" -> "d$". * Also used to redo a command for ".". @@ -3728,9 +3728,9 @@ do_map( ) { if (abbrev) - MSG(_("No abbreviation found")); + msg(_("No abbreviation found")); else - MSG(_("No mapping found")); + msg(_("No mapping found")); } goto theend; /* listing finished */ } @@ -4047,7 +4047,7 @@ showmap( mapchars = map_mode_to_chars(mp->m_mode); if (mapchars != NULL) { - msg_puts(mapchars); + msg_puts((char *)mapchars); len = (int)STRLEN(mapchars); vim_free(mapchars); } @@ -4064,9 +4064,9 @@ showmap( } while (len < 12); if (mp->m_noremap == REMAP_NONE) - msg_puts_attr((char_u *)"*", HL_ATTR(HLF_8)); + msg_puts_attr("*", HL_ATTR(HLF_8)); else if (mp->m_noremap == REMAP_SCRIPT) - msg_puts_attr((char_u *)"&", HL_ATTR(HLF_8)); + msg_puts_attr("&", HL_ATTR(HLF_8)); else msg_putchar(' '); @@ -4078,7 +4078,7 @@ showmap( /* Use FALSE below if we only want things like <Up> to show up as such on * the rhs, and not M-x etc, TRUE gets both -- webb */ if (*mp->m_str == NUL) - msg_puts_attr((char_u *)"<Nop>", HL_ATTR(HLF_8)); + msg_puts_attr("<Nop>", HL_ATTR(HLF_8)); else { /* Remove escaping of CSI, because "m_str" is in a format to be used