diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/buffer.c | 31 | ||||
-rw-r--r-- | src/crypt.c | 4 | ||||
-rw-r--r-- | src/edit.c | 16 | ||||
-rw-r--r-- | src/eval.c | 49 | ||||
-rw-r--r-- | src/evalfunc.c | 4 | ||||
-rw-r--r-- | src/ex_cmds.c | 28 | ||||
-rw-r--r-- | src/ex_cmds2.c | 14 | ||||
-rw-r--r-- | src/ex_docmd.c | 26 | ||||
-rw-r--r-- | src/ex_eval.c | 8 | ||||
-rw-r--r-- | src/ex_getln.c | 20 | ||||
-rw-r--r-- | src/farsi.c | 8 | ||||
-rw-r--r-- | src/farsi.h | 6 | ||||
-rw-r--r-- | src/fileio.c | 47 | ||||
-rw-r--r-- | src/getchar.c | 14 | ||||
-rw-r--r-- | src/globals.h | 2 | ||||
-rw-r--r-- | src/gui.c | 4 | ||||
-rw-r--r-- | src/gui_w32.c | 2 | ||||
-rw-r--r-- | src/hardcopy.c | 2 | ||||
-rw-r--r-- | src/if_cscope.c | 29 | ||||
-rw-r--r-- | src/if_mzsch.c | 4 | ||||
-rw-r--r-- | src/if_perl.xs | 4 | ||||
-rw-r--r-- | src/if_py_both.h | 8 | ||||
-rw-r--r-- | src/if_ruby.c | 10 | ||||
-rw-r--r-- | src/if_tcl.c | 4 | ||||
-rw-r--r-- | src/mark.c | 12 | ||||
-rw-r--r-- | src/mbyte.c | 4 | ||||
-rw-r--r-- | src/memline.c | 138 | ||||
-rw-r--r-- | src/menu.c | 14 | ||||
-rw-r--r-- | src/message.c | 149 | ||||
-rw-r--r-- | src/misc1.c | 19 | ||||
-rw-r--r-- | src/misc2.c | 12 | ||||
-rw-r--r-- | src/netbeans.c | 4 | ||||
-rw-r--r-- | src/normal.c | 14 | ||||
-rw-r--r-- | src/ops.c | 30 | ||||
-rw-r--r-- | src/option.c | 18 | ||||
-rw-r--r-- | src/os_amiga.c | 12 | ||||
-rw-r--r-- | src/os_unix.c | 52 | ||||
-rw-r--r-- | src/os_win32.c | 6 | ||||
-rw-r--r-- | src/proto/eval.pro | 2 | ||||
-rw-r--r-- | src/proto/message.pro | 33 | ||||
-rw-r--r-- | src/quickfix.c | 20 | ||||
-rw-r--r-- | src/regexp.c | 4 | ||||
-rw-r--r-- | src/screen.c | 55 | ||||
-rw-r--r-- | src/search.c | 30 | ||||
-rw-r--r-- | src/sign.c | 26 | ||||
-rw-r--r-- | src/spell.c | 18 | ||||
-rw-r--r-- | src/spellfile.c | 26 | ||||
-rw-r--r-- | src/syntax.c | 134 | ||||
-rw-r--r-- | src/tag.c | 24 | ||||
-rw-r--r-- | src/term.c | 8 | ||||
-rw-r--r-- | src/ui.c | 4 | ||||
-rw-r--r-- | src/undo.c | 16 | ||||
-rw-r--r-- | src/userfunc.c | 44 | ||||
-rw-r--r-- | src/version.c | 94 | ||||
-rw-r--r-- | src/vim.h | 7 | ||||
-rw-r--r-- | src/window.c | 4 |
56 files changed, 679 insertions, 698 deletions
diff --git a/src/buffer.c b/src/buffer.c index c22773f7a4..18e08ad18e 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1083,7 +1083,7 @@ handle_swap_exists(bufref_T *old_curbuf) /* User selected Recover at ATTENTION prompt. */ msg_scroll = TRUE; ml_recover(); - MSG_PUTS("\n"); /* don't overwrite the last message */ + msg_puts("\n"); /* don't overwrite the last message */ cmdline_row = msg_row; do_modelines(0); @@ -3449,17 +3449,17 @@ fileinfo( { char_u *name; int n; - char_u *p; - char_u *buffer; + char *p; + char *buffer; size_t len; - buffer = alloc(IOSIZE); + buffer = (char *)alloc(IOSIZE); if (buffer == NULL) return; if (fullname > 1) /* 2 CTRL-G: include buffer number */ { - vim_snprintf((char *)buffer, IOSIZE, "buf %d: ", curbuf->b_fnum); + vim_snprintf(buffer, IOSIZE, "buf %d: ", curbuf->b_fnum); p = buffer + STRLEN(buffer); } else @@ -3467,18 +3467,18 @@ fileinfo( *p++ = '"'; if (buf_spname(curbuf) != NULL) - vim_strncpy(p, buf_spname(curbuf), IOSIZE - (p - buffer) - 1); + vim_strncpy((char_u *)p, buf_spname(curbuf), IOSIZE - (p - buffer) - 1); else { if (!fullname && curbuf->b_fname != NULL) name = curbuf->b_fname; else name = curbuf->b_ffname; - home_replace(shorthelp ? curbuf : NULL, name, p, + home_replace(shorthelp ? curbuf : NULL, name, (char_u *)p, (int)(IOSIZE - (p - buffer)), TRUE); } - vim_snprintf_add((char *)buffer, IOSIZE, "\"%s%s%s%s%s%s", + vim_snprintf_add(buffer, IOSIZE, "\"%s%s%s%s%s%s", curbufIsChanged() ? (shortmess(SHM_MOD) ? " [+]" : _(" [Modified]")) : " ", (curbuf->b_flags & BF_NOTEDITED) @@ -3506,29 +3506,30 @@ fileinfo( n = (int)(((long)curwin->w_cursor.lnum * 100L) / (long)curbuf->b_ml.ml_line_count); if (curbuf->b_ml.ml_flags & ML_EMPTY) - vim_snprintf_add((char *)buffer, IOSIZE, "%s", _(no_lines_msg)); + vim_snprintf_add(buffer, IOSIZE, "%s", _(no_lines_msg)); #ifdef FEAT_CMDL_INFO else if (p_ru) /* Current line and column are already on the screen -- webb */ - vim_snprintf_add((char *)buffer, IOSIZE, + vim_snprintf_add(buffer, IOSIZE, NGETTEXT("%ld line --%d%%--", "%ld lines --%d%%--", curbuf->b_ml.ml_line_count), (long)curbuf->b_ml.ml_line_count, n); #endif else { - vim_snprintf_add((char *)buffer, IOSIZE, + vim_snprintf_add(buffer, IOSIZE, _("line %ld of %ld --%d%%-- col "), (long)curwin->w_cursor.lnum, (long)curbuf->b_ml.ml_line_count, n); validate_virtcol(); len = STRLEN(buffer); - col_print(buffer + len, IOSIZE - len, + col_print((char_u *)buffer + len, IOSIZE - len, (int)curwin->w_cursor.col + 1, (int)curwin->w_virtcol + 1); } - (void)append_arg_number(curwin, buffer, IOSIZE, !shortmess(SHM_FILE)); + (void)append_arg_number(curwin, (char_u *)buffer, IOSIZE, + !shortmess(SHM_FILE)); if (dont_truncate) { @@ -3542,14 +3543,14 @@ fileinfo( } else { - p = msg_trunc_attr(buffer, FALSE, 0); + p = (char *)msg_trunc_attr(buffer, FALSE, 0); if (restart_edit != 0 || (msg_scrolled && !need_wait_return)) /* Need to repeat the message after redrawing when: * - When restart_edit is set (otherwise there will be a delay * before redrawing). * - When the screen was scrolled but there is no wait-return * prompt. */ - set_keep_msg(p, 0); + set_keep_msg((char_u *)p, 0); } vim_free(buffer); diff --git a/src/crypt.c b/src/crypt.c index f82ee7bdb7..47617e9a9c 100644 --- a/src/crypt.c +++ b/src/crypt.c @@ -513,7 +513,7 @@ crypt_check_method(int method) if (method < CRYPT_M_BF2) { msg_scroll = TRUE; - MSG(_("Warning: Using a weak encryption method; see :help 'cm'")); + msg(_("Warning: Using a weak encryption method; see :help 'cm'")); } } @@ -555,7 +555,7 @@ crypt_get_key( { if (p2 != NULL && STRCMP(p1, p2) != 0) { - MSG(_("Keys don't match!")); + msg(_("Keys don't match!")); crypt_free_key(p1); crypt_free_key(p2); p2 = NULL; diff --git a/src/edit.c b/src/edit.c index ea50e80184..482e644e8d 100644 --- a/src/edit.c +++ b/src/edit.c @@ -2387,8 +2387,8 @@ has_compl_option(int dict_opt) { ctrl_x_mode = CTRL_X_NORMAL; edit_submode = NULL; - msg_attr(dict_opt ? (char_u *)_("'dictionary' option is empty") - : (char_u *)_("'thesaurus' option is empty"), + msg_attr(dict_opt ? _("'dictionary' option is empty") + : _("'thesaurus' option is empty"), HL_ATTR(HLF_E)); if (emsg_silent == 0) { @@ -3385,7 +3385,7 @@ ins_compl_files( { vim_snprintf((char *)IObuff, IOSIZE, _("Scanning dictionary: %s"), (char *)files[i]); - (void)msg_trunc_attr(IObuff, TRUE, HL_ATTR(HLF_R)); + (void)msg_trunc_attr((char *)IObuff, TRUE, HL_ATTR(HLF_R)); } if (fp != NULL) @@ -4500,7 +4500,7 @@ ins_compl_get_exp(pos_T *ini) : ins_buf->b_sfname == NULL ? ins_buf->b_fname : ins_buf->b_sfname); - (void)msg_trunc_attr(IObuff, TRUE, HL_ATTR(HLF_R)); + (void)msg_trunc_attr((char *)IObuff, TRUE, HL_ATTR(HLF_R)); } else if (*e_cpt == NUL) break; @@ -4530,7 +4530,7 @@ ins_compl_get_exp(pos_T *ini) { type = CTRL_X_TAGS; vim_snprintf((char *)IObuff, IOSIZE, _("Scanning tags.")); - (void)msg_trunc_attr(IObuff, TRUE, HL_ATTR(HLF_R)); + (void)msg_trunc_attr((char *)IObuff, TRUE, HL_ATTR(HLF_R)); } else type = -1; @@ -5132,7 +5132,7 @@ ins_compl_next( } vim_snprintf((char *)IObuff, IOSIZE, "%s %s%s", lead, s > compl_shown_match->cp_fname ? "<" : "", s); - msg(IObuff); + msg((char *)IObuff); redraw_cmdline = FALSE; /* don't overwrite! */ } } @@ -5878,7 +5878,7 @@ ins_complete(int c, int enable_pum) if (edit_submode_extra != NULL) { if (!p_smd) - msg_attr(edit_submode_extra, + msg_attr((char *)edit_submode_extra, edit_submode_highl < HLF_COUNT ? HL_ATTR(edit_submode_highl) : 0); } @@ -8856,7 +8856,7 @@ ins_esc( if (reg_recording != 0 || restart_edit != NUL) showmode(); else if (p_smd) - MSG(""); + msg(""); return TRUE; /* exit Insert mode */ } diff --git a/src/eval.c b/src/eval.c index d8a9e4318a..d1a7fd37dd 100644 --- a/src/eval.c +++ b/src/eval.c @@ -245,8 +245,8 @@ static char_u * make_expanded_name(char_u *in_start, char_u *expr_start, char_u static void check_vars(char_u *name, int len); static typval_T *alloc_string_tv(char_u *string); static void delete_var(hashtab_T *ht, hashitem_T *hi); -static void list_one_var(dictitem_T *v, char_u *prefix, int *first); -static void list_one_var_a(char_u *prefix, char_u *name, int type, char_u *string, int *first); +static void list_one_var(dictitem_T *v, char *prefix, int *first); +static void list_one_var_a(char *prefix, char_u *name, int type, char_u *string, int *first); static char_u *find_option_end(char_u **arg, int *opt_flags); /* for VIM_VERSION_ defines */ @@ -1448,7 +1448,7 @@ skip_var_one(char_u *arg) void list_hashtable_vars( hashtab_T *ht, - char_u *prefix, + char *prefix, int empty, int *first) { @@ -1466,8 +1466,8 @@ list_hashtable_vars( di = HI2DI(hi); // apply :filter /pat/ to variable name - vim_strncpy((char_u *) buf, prefix, IOSIZE - 1); - vim_strcat((char_u *) buf, di->di_key, IOSIZE); + vim_strncpy((char_u *)buf, (char_u *)prefix, IOSIZE - 1); + vim_strcat((char_u *)buf, di->di_key, IOSIZE); if (message_filtered(buf)) continue; @@ -1484,7 +1484,7 @@ list_hashtable_vars( static void list_glob_vars(int *first) { - list_hashtable_vars(&globvarht, (char_u *)"", TRUE, first); + list_hashtable_vars(&globvarht, "", TRUE, first); } /* @@ -1493,8 +1493,7 @@ list_glob_vars(int *first) static void list_buf_vars(int *first) { - list_hashtable_vars(&curbuf->b_vars->dv_hashtab, (char_u *)"b:", - TRUE, first); + list_hashtable_vars(&curbuf->b_vars->dv_hashtab, "b:", TRUE, first); } /* @@ -1503,8 +1502,7 @@ list_buf_vars(int *first) static void list_win_vars(int *first) { - list_hashtable_vars(&curwin->w_vars->dv_hashtab, - (char_u *)"w:", TRUE, first); + list_hashtable_vars(&curwin->w_vars->dv_hashtab, "w:", TRUE, first); } /* @@ -1513,8 +1511,7 @@ list_win_vars(int *first) static void list_tab_vars(int *first) { - list_hashtable_vars(&curtab->tp_vars->dv_hashtab, - (char_u *)"t:", TRUE, first); + list_hashtable_vars(&curtab->tp_vars->dv_hashtab, "t:", TRUE, first); } /* @@ -1523,7 +1520,7 @@ list_tab_vars(int *first) static void list_vim_vars(int *first) { - list_hashtable_vars(&vimvarht, (char_u *)"v:", FALSE, first); + list_hashtable_vars(&vimvarht, "v:", FALSE, first); } /* @@ -1534,7 +1531,7 @@ list_script_vars(int *first) { if (current_sctx.sc_sid > 0 && current_sctx.sc_sid <= ga_scripts.ga_len) list_hashtable_vars(&SCRIPT_VARS(current_sctx.sc_sid), - (char_u *)"s:", FALSE, first); + "s:", FALSE, first); } /* @@ -1619,7 +1616,7 @@ list_arg_vars(exarg_T *eap, char_u *arg, int *first) s = echo_string(&tv, &tf, numbuf, 0); c = *arg; *arg = NUL; - list_one_var_a((char_u *)"", + list_one_var_a("", arg == arg_subsc ? name : name_start, tv.v_type, s == NULL ? (char_u *)"" : s, @@ -5462,7 +5459,7 @@ garbage_collect(int testing) } else if (p_verbose > 0) { - verb_msg((char_u *)_("Not enough memory to set references, garbage collection aborted!")); + verb_msg(_("Not enough memory to set references, garbage collection aborted!")); } return did_free; @@ -7791,7 +7788,7 @@ delete_var(hashtab_T *ht, hashitem_T *hi) * List the value of one internal variable. */ static void -list_one_var(dictitem_T *v, char_u *prefix, int *first) +list_one_var(dictitem_T *v, char *prefix, int *first) { char_u *tofree; char_u *s; @@ -7805,7 +7802,7 @@ list_one_var(dictitem_T *v, char_u *prefix, int *first) static void list_one_var_a( - char_u *prefix, + char *prefix, char_u *name, int type, char_u *string, @@ -7815,7 +7812,7 @@ list_one_var_a( msg_start(); msg_puts(prefix); if (name != NULL) /* "a:" vars don't have a name stored */ - msg_puts(name); + msg_puts((char *)name); msg_putchar(' '); msg_advance(22); if (type == VAR_NUMBER) @@ -7840,7 +7837,7 @@ list_one_var_a( msg_outtrans(string); if (type == VAR_FUNC || type == VAR_PARTIAL) - msg_puts((char_u *)"()"); + msg_puts("()"); if (*first) { msg_clr_eos(); @@ -8304,7 +8301,7 @@ get_user_input( *p = NUL; msg_start(); msg_clr_eos(); - msg_puts_attr(prompt, echo_attr); + msg_puts_attr((char *)prompt, echo_attr); msg_didout = FALSE; msg_starthere(); *p = c; @@ -8422,7 +8419,7 @@ ex_echo(exarg_T *eap) } } else if (eap->cmdidx == CMD_echo) - msg_puts_attr((char_u *)" ", echo_attr); + msg_puts_attr(" ", echo_attr); p = echo_string(&rettv, &tofree, numbuf, get_copyID()); if (p != NULL) for ( ; *p != NUL && !got_int; ++p) @@ -8546,7 +8543,7 @@ ex_execute(exarg_T *eap) if (eap->cmdidx == CMD_echomsg) { - MSG_ATTR(ga.ga_data, echo_attr); + msg_attr(ga.ga_data, echo_attr); out_flush(); } else if (eap->cmdidx == CMD_echoerr) @@ -9159,11 +9156,11 @@ last_set_msg(sctx_T script_ctx) if (p != NULL) { verbose_enter(); - MSG_PUTS(_("\n\tLast set from ")); - MSG_PUTS(p); + msg_puts(_("\n\tLast set from ")); + msg_puts((char *)p); if (script_ctx.sc_lnum > 0) { - MSG_PUTS(_(" line ")); + msg_puts(_(" line ")); msg_outnum((long)script_ctx.sc_lnum); } verbose_leave(); diff --git a/src/evalfunc.c b/src/evalfunc.c index 1bdb722635..ac009e6e9a 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -7169,7 +7169,7 @@ f_inputlist(typval_T *argvars, typval_T *rettv) for (li = argvars[0].vval.v_list->lv_first; li != NULL; li = li->li_next) { - msg_puts(tv_get_string(&li->li_tv)); + msg_puts((char *)tv_get_string(&li->li_tv)); msg_putchar('\n'); } @@ -7198,7 +7198,7 @@ f_inputrestore(typval_T *argvars UNUSED, typval_T *rettv) } else if (p_verbose > 1) { - verb_msg((char_u *)_("called inputrestore() more often than inputsave()")); + verb_msg(_("called inputrestore() more often than inputsave()")); rettv->vval.v_number = 1; /* Failed */ } } diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 25322c2bd8..b6bd3d348e 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -62,7 +62,7 @@ do_ascii(exarg_T *eap UNUSED) c = gchar_cursor(); if (c == NUL) { - MSG("NUL"); + msg("NUL"); return; } @@ -152,7 +152,7 @@ do_ascii(exarg_T *eap UNUSED) } #endif - msg(IObuff); + msg((char *)IObuff); } /* @@ -1490,11 +1490,11 @@ do_filter( { if (do_in) { - vim_snprintf((char *)msg_buf, sizeof(msg_buf), + vim_snprintf(msg_buf, sizeof(msg_buf), _("%ld lines filtered"), (long)linecount); if (msg(msg_buf) && !msg_scroll) /* save message to display it after redraw */ - set_keep_msg(msg_buf, 0); + set_keep_msg((char_u *)msg_buf, 0); } else msgmore((long)linecount); @@ -1586,7 +1586,7 @@ do_shell( if (!winstart) starttermcap(); /* don't want a message box here */ #endif - MSG_PUTS(_("[No write since last change]\n")); + msg_puts(_("[No write since last change]\n")); #ifdef FEAT_GUI_MSWIN if (!winstart) stoptermcap(); @@ -3028,11 +3028,11 @@ print_line_no_prefix( int use_number, int list) { - char_u numbuf[30]; + char numbuf[30]; if (curwin->w_p_nu || use_number) { - vim_snprintf((char *)numbuf, sizeof(numbuf), + vim_snprintf(numbuf, sizeof(numbuf), "%*ld ", number_width(curwin), (long)lnum); msg_puts_attr(numbuf, HL_ATTR(HLF_N)); /* Highlight line nrs */ } @@ -5926,7 +5926,7 @@ outofmem: beginline(BL_WHITE | BL_FIX); } if (!do_sub_msg(subflags.do_count) && subflags.do_ask) - MSG(""); + msg(""); } else global_need_beginline = TRUE; @@ -5939,7 +5939,7 @@ outofmem: if (got_int) /* interrupted */ emsg(_(e_interr)); else if (got_match) /* did find something but nothing substituted */ - MSG(""); + msg(""); else if (subflags.do_error) /* nothing found */ semsg(_(e_patnotf2), get_search_pat()); } @@ -5995,13 +5995,13 @@ do_sub_msg( : NGETTEXT("%ld substitution on %ld lines", "%ld substitutions on %ld lines", sub_nsubs); - vim_snprintf_add((char *)msg_buf, sizeof(msg_buf), + vim_snprintf_add(msg_buf, sizeof(msg_buf), NGETTEXT(msg_single, msg_plural, sub_nlines), sub_nsubs, (long)sub_nlines); if (msg(msg_buf)) /* save message to display it after redraw */ - set_keep_msg(msg_buf, 0); + set_keep_msg((char_u *)msg_buf, 0); return TRUE; } if (got_int) @@ -6147,7 +6147,7 @@ ex_global(exarg_T *eap) * pass 2: execute the command for each line that has been marked */ if (got_int) - MSG(_(e_interr)); + msg(_(e_interr)); else if (ndone == 0) { if (type == 'v') @@ -7755,7 +7755,7 @@ ex_oldfiles(exarg_T *eap UNUSED) char_u *fname; if (l == NULL) - msg((char_u *)_("No old files")); + msg(_("No old files")); else { msg_start(); @@ -7767,7 +7767,7 @@ ex_oldfiles(exarg_T *eap UNUSED) if (!message_filtered(fname)) { msg_outnum((long)nr); - MSG_PUTS(": "); + msg_puts(": "); msg_outtrans(fname); msg_clr_eos(); msg_putchar('\n'); diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c index d044fdb2c0..72d28c52d1 100644 --- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -143,7 +143,7 @@ do_debug(char_u *cmd) debug_mode = TRUE; if (!debug_did_msg) - MSG(_("Entering Debug mode. Type \"cont\" to continue.")); + msg(_("Entering Debug mode. Type \"cont\" to continue.")); if (debug_oldval != NULL) { smsg(_("Oldval = \"%s\""), debug_oldval); @@ -157,7 +157,7 @@ do_debug(char_u *cmd) debug_newval = NULL; } if (sourcing_name != NULL) - msg(sourcing_name); + msg((char *)sourcing_name); if (sourcing_lnum != 0) smsg(_("line %ld: %s"), (long)sourcing_lnum, cmd); else @@ -390,7 +390,7 @@ do_checkbacktracelevel(void) if (debug_backtrace_level < 0) { debug_backtrace_level = 0; - MSG(_("frame is zero")); + msg(_("frame is zero")); } else { @@ -857,7 +857,7 @@ ex_breaklist(exarg_T *eap UNUSED) int i; if (dbg_breakp.ga_len == 0) - MSG(_("No breakpoints defined")); + msg(_("No breakpoints defined")); else for (i = 0; i < dbg_breakp.ga_len; ++i) { @@ -2430,7 +2430,7 @@ buf_write_all(buf_T *buf, int forceit) if (curbuf != old_curbuf) { msg_source(HL_ATTR(HLF_W)); - MSG(_("Warning: Entered other buffer unexpectedly (check autocommands)")); + msg(_("Warning: Entered other buffer unexpectedly (check autocommands)")); } return retval; } @@ -4112,7 +4112,7 @@ source_pyx_file(exarg_T *eap, char_u *fname) vim_snprintf((char *)IObuff, IOSIZE, _("W20: Required python version 2.x not supported, ignoring file: %s"), fname); - MSG(IObuff); + msg((char *)IObuff); # endif return; } @@ -4124,7 +4124,7 @@ source_pyx_file(exarg_T *eap, char_u *fname) vim_snprintf((char *)IObuff, IOSIZE, _("W21: Required python version 3.x not supported, ignoring file: %s"), fname); - MSG(IObuff); + msg((char *)IObuff); # endif return; } diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 97976442eb..8a9b2f4bf9 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -562,7 +562,7 @@ do_exmode( ++hold_gui_events; #endif - MSG(_("Entering Ex mode. Type \"visual\" to go to Normal mode.")); + msg(_("Entering Ex mode. Type \"visual\" to go to Normal mode.")); while (exmode_active) { /* Check for a ":normal" command and no more characters left. */ @@ -1019,7 +1019,7 @@ do_cmdline( smsg(_("line %ld: %s"), (long)sourcing_lnum, cmdline_copy); if (msg_silent == 0) - msg_puts((char_u *)"\n"); /* don't overwrite this */ + msg_puts("\n"); /* don't overwrite this */ verbose_leave_scroll(); --no_wait_return; @@ -6043,7 +6043,7 @@ uc_list(char_u *name, size_t name_len) /* Put out the title first time */ if (!found) - MSG_PUTS_TITLE(_("\n Name Args Address Complete Definition")); + msg_puts_title(_("\n Name Args Address Complete Definition")); found = TRUE; msg_putchar('\n'); if (got_int) @@ -6150,7 +6150,7 @@ uc_list(char_u *name, size_t name_len) } if (!found) - MSG(_("No user-defined commands found")); + msg(_("No user-defined commands found")); } static char * @@ -7239,13 +7239,13 @@ ex_colorscheme(exarg_T *eap) } if (p != NULL) { - MSG(p); + msg((char *)p); vim_free(p); } else - MSG("default"); + msg("default"); #else - MSG(_("unknown")); + msg(_("unknown")); #endif } else if (load_colors(eap->arg) == FAIL) @@ -7256,7 +7256,7 @@ ex_colorscheme(exarg_T *eap) ex_highlight(exarg_T *eap) { if (*eap->arg == NUL && eap->cmd[2] == '!') - MSG(_("Greetings, Vim user!")); + msg(_("Greetings, Vim user!")); do_highlight(eap->arg, eap->forceit, FALSE); } @@ -7672,7 +7672,7 @@ ex_tabonly(exarg_T *eap) else # endif if (first_tabpage->tp_next == NULL) - MSG(_("Already only one tab page")); + msg(_("Already only one tab page")); else { tab_number = get_tabpage_arg(eap); @@ -8921,9 +8921,9 @@ ex_popup(exarg_T *eap) ex_swapname(exarg_T *eap UNUSED) { if (curbuf->b_ml.ml_mfp == NULL || curbuf->b_ml.ml_mfp->mf_fname == NULL) - MSG(_("No swap file")); + msg(_("No swap file")); else - msg(curbuf->b_ml.ml_mfp->mf_fname); + msg((char *)curbuf->b_ml.ml_mfp->mf_fname); } /* @@ -9221,7 +9221,7 @@ ex_pwd(exarg_T *eap UNUSED) #ifdef BACKSLASH_IN_FILENAME slash_adjust(NameBuff); #endif - msg(NameBuff); + msg((char *)NameBuff); } else emsg(_("E187: Unknown")); @@ -9402,7 +9402,7 @@ ex_winpos(exarg_T *eap) # endif { sprintf((char *)IObuff, _("Window position: X %d, Y %d"), x, y); - msg(IObuff); + msg((char *)IObuff); } else # endif diff --git a/src/ex_eval.c b/src/ex_eval.c index 10a9dbcbfb..63bca67180 100644 --- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -556,7 +556,7 @@ throw_exception(void *value, except_type_T type, char_u *cmdname) msg_scroll = TRUE; /* always scroll up, don't overwrite */ smsg(_("Exception thrown: %s"), excp->value); - msg_puts((char_u *)"\n"); /* don't overwrite this either */ + msg_puts("\n"); /* don't overwrite this either */ if (debug_break_level > 0 || *p_vfile == NUL) cmdline_row = msg_row; @@ -610,7 +610,7 @@ discard_exception(except_T *excp, int was_finished) ? _("Exception finished: %s") : _("Exception discarded: %s"), exc |