diff options
| author | James McCoy <jamessan@jamessan.com> | 2021-11-01 11:27:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 11:27:42 -0400 |
| commit | b8eabb37b1d4e267a4db7e639e8cbdec2ed64b8e (patch) | |
| tree | d8fc27ffbbb9ece2b15008b09d4b4a6b89d0d20b /src/nvim/memfile.c | |
| parent | 961cd83b3b39855b232841f37ded856c8621bd90 (diff) | |
| parent | 9e479ea05e00e63ccc985fc8ce4912c709f30111 (diff) | |
| download | rneovim-b8eabb37b1d4e267a4db7e639e8cbdec2ed64b8e.tar.gz rneovim-b8eabb37b1d4e267a4db7e639e8cbdec2ed64b8e.tar.bz2 rneovim-b8eabb37b1d4e267a4db7e639e8cbdec2ed64b8e.zip | |
Merge pull request #16131 from jamessan/vim-8.1.0306
Diffstat (limited to 'src/nvim/memfile.c')
| -rw-r--r-- | src/nvim/memfile.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nvim/memfile.c b/src/nvim/memfile.c index 438340e0c4..2a0ea9a269 100644 --- a/src/nvim/memfile.c +++ b/src/nvim/memfile.c @@ -168,7 +168,7 @@ void mf_close(memfile_T *mfp, bool del_file) return; } if (mfp->mf_fd >= 0 && close(mfp->mf_fd) < 0) { - EMSG(_(e_swapclose)); + emsg(_(e_swapclose)); } if (del_file && mfp->mf_fname != NULL) { os_remove((char *)mfp->mf_fname); @@ -206,7 +206,7 @@ void mf_close_file(buf_T *buf, bool getlines) } if (close(mfp->mf_fd) < 0) { // close the file - EMSG(_(e_swapclose)); + emsg(_(e_swapclose)); } mfp->mf_fd = -1; @@ -325,7 +325,7 @@ void mf_put(memfile_T *mfp, bhdr_T *hp, bool dirty, bool infile) unsigned flags = hp->bh_flags; if ((flags & BH_LOCKED) == 0) { - IEMSG(_("E293: block was not locked")); + iemsg(_("E293: block was not locked")); } flags &= ~BH_LOCKED; if (dirty) { @@ -648,7 +648,7 @@ static int mf_write(memfile_T *mfp, bhdr_T *hp) /// write or when hitting a key. We keep on trying, in case some /// space becomes available. if (!did_swapwrite_msg) { - EMSG(_("E297: Write error in swap file")); + emsg(_("E297: Write error in swap file")); } did_swapwrite_msg = true; return FAIL; @@ -792,7 +792,7 @@ static bool mf_do_open(memfile_T *mfp, char_u *fname, int flags) if ((flags & O_CREAT) && os_fileinfo_link((char *)mfp->mf_fname, &file_info)) { mfp->mf_fd = -1; - EMSG(_("E300: Swap file already exists (symlink attack?)")); + emsg(_("E300: Swap file already exists (symlink attack?)")); } else { // try to open the file mfp->mf_fd = mch_open_rw((char *)mfp->mf_fname, flags | O_NOFOLLOW); |