Mercurial > vim
diff src/search.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/search.c +++ b/src/search.c @@ -5059,7 +5059,7 @@ find_pattern_in_path( message */ { msg_home_replace_hl(new_fname); - MSG_PUTS(_(" (includes previously listed match)")); + msg_puts(_(" (includes previously listed match)")); prev_fname = NULL; } } @@ -5078,25 +5078,25 @@ find_pattern_in_path( else { gotocmdline(TRUE); /* cursor at status line */ - MSG_PUTS_TITLE(_("--- Included files ")); + msg_puts_title(_("--- Included files ")); if (action != ACTION_SHOW_ALL) - MSG_PUTS_TITLE(_("not found ")); - MSG_PUTS_TITLE(_("in path ---\n")); + msg_puts_title(_("not found ")); + msg_puts_title(_("in path ---\n")); } did_show = TRUE; while (depth_displayed < depth && !got_int) { ++depth_displayed; for (i = 0; i < depth_displayed; i++) - MSG_PUTS(" "); + msg_puts(" "); msg_home_replace(files[depth_displayed].name); - MSG_PUTS(" -->\n"); + msg_puts(" -->\n"); } if (!got_int) /* don't display if 'q' typed for "--more--" message */ { for (i = 0; i <= depth_displayed; i++) - MSG_PUTS(" "); + msg_puts(" "); if (new_fname != NULL) { /* using "new_fname" is more reliable, e.g., when @@ -5154,9 +5154,9 @@ find_pattern_in_path( if (new_fname == NULL && action == ACTION_SHOW_ALL) { if (already_searched) - MSG_PUTS(_(" (Already listed)")); + msg_puts(_(" (Already listed)")); else - MSG_PUTS(_(" NOT FOUND")); + msg_puts(_(" NOT FOUND")); } } out_flush(); /* output each line directly */ @@ -5212,7 +5212,7 @@ find_pattern_in_path( vim_snprintf((char*)IObuff, IOSIZE, _("Scanning included file: %s"), (char *)new_fname); - msg_trunc_attr(IObuff, TRUE, HL_ATTR(HLF_R)); + msg_trunc_attr((char *)IObuff, TRUE, HL_ATTR(HLF_R)); } else #endif @@ -5593,9 +5593,9 @@ exit_matched: if (!did_show) { if (action != ACTION_SHOW_ALL) - MSG(_("All included files were found")); + msg(_("All included files were found")); else - MSG(_("No included files")); + msg(_("No included files")); } } else if (!found @@ -5658,11 +5658,11 @@ show_pat_in_path( if (action == ACTION_SHOW_ALL) { sprintf((char *)IObuff, "%3ld: ", count); /* show match nr */ - msg_puts(IObuff); + msg_puts((char *)IObuff); sprintf((char *)IObuff, "%4ld", *lnum); /* show line nr */ /* Highlight line numbers */ - msg_puts_attr(IObuff, HL_ATTR(HLF_N)); - MSG_PUTS(" "); + msg_puts_attr((char *)IObuff, HL_ATTR(HLF_N)); + msg_puts(" "); } msg_prt_line(line, FALSE); out_flush(); /* show one line at a time */