From efa924f66b183d9cf2404ce91c4f009c27e0515a Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 18 Oct 2021 09:08:46 -0400 Subject: 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 --- src/nvim/ex_session.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/nvim/ex_session.c') diff --git a/src/nvim/ex_session.c b/src/nvim/ex_session.c index 0dfd7e1edd..9aa8cc0107 100644 --- a/src/nvim/ex_session.c +++ b/src/nvim/ex_session.c @@ -860,7 +860,7 @@ void ex_loadview(exarg_T *eap) char *fname = get_view_file(*eap->arg); if (fname != NULL) { if (do_source(fname, false, DOSO_NONE) == FAIL) { - EMSG2(_(e_notopen), fname); + semsg(_(e_notopen), fname); } xfree(fname); } @@ -980,7 +980,7 @@ void ex_mkrc(exarg_T *eap) || ((ssop_flags & SSOP_CURDIR) && globaldir != NULL))) { if (os_chdir((char *)dirnow) != 0) { - EMSG(_(e_prev_dir)); + emsg(_(e_prev_dir)); } shorten_fnames(true); // restore original dir @@ -988,7 +988,7 @@ void ex_mkrc(exarg_T *eap) || ((ssop_flags & SSOP_CURDIR) && globaldir != NULL))) { if (os_chdir((char *)dirnow) != 0) { - EMSG(_(e_prev_dir)); + emsg(_(e_prev_dir)); } shorten_fnames(true); } @@ -1025,7 +1025,7 @@ void ex_mkrc(exarg_T *eap) failed |= fclose(fd); if (failed) { - EMSG(_(e_write)); + emsg(_(e_write)); } else if (eap->cmdidx == CMD_mksession) { // successful session write - set v:this_session char *const tbuf = xmalloc(MAXPATHL); @@ -1043,7 +1043,7 @@ void ex_mkrc(exarg_T *eap) static char *get_view_file(int c) { if (curbuf->b_ffname == NULL) { - EMSG(_(e_noname)); + emsg(_(e_noname)); return NULL; } char *sname = (char *)home_replace_save(NULL, curbuf->b_ffname); -- cgit