Merge remote-tracking branch 'upstream/master' into mix_20240309HEADrahm

1 files changed, 8 insertions, 7 deletions

diff --git a/src/nvim/bufwrite.c b/src/nvim/bufwrite.c
index 5f830b4219..1afa10df63 100644
--- a/src/nvim/bufwrite.c
+++ b/src/nvim/bufwrite.c
@@ -27,7 +27,6 @@
 #include "nvim/fileio.h"
 #include "nvim/gettext_defs.h"
 #include "nvim/globals.h"
-#include "nvim/highlight.h"
 #include "nvim/highlight_defs.h"
 #include "nvim/iconv_defs.h"
 #include "nvim/input.h"
@@ -351,7 +350,7 @@ static int check_mtime(buf_T *buf, FileInfo *file_info)
     msg_silent = 0;     // Must give this prompt.
     // Don't use emsg() here, don't want to flush the buffers.
     msg(_("WARNING: The file has been changed since reading it!!!"), HLF_E);
-    if (ask_yesno(_("Do you really want to write to it"), true) == 'n') {
+    if (ask_yesno(_("Do you really want to write to it")) == 'n') {
       return FAIL;
     }
     msg_scroll = false;  // Always overwrite the file message now.
@@ -725,9 +724,9 @@ static int buf_write_make_backup(char *fname, bool append, FileInfo *file_info_o
   FileInfo file_info;
   const bool no_prepend_dot = false;
 
-  if ((bkc & BKC_YES) || append) {       // "yes"
+  if ((bkc & kOptBkcFlagYes) || append) {       // "yes"
     *backup_copyp = true;
-  } else if ((bkc & BKC_AUTO)) {          // "auto"
+  } else if ((bkc & kOptBkcFlagAuto)) {          // "auto"
     // Don't rename the file when:
     // - it's a hard link
     // - it's a symbolic link
@@ -773,19 +772,19 @@ static int buf_write_make_backup(char *fname, bool append, FileInfo *file_info_o
   }
 
   // Break symlinks and/or hardlinks if we've been asked to.
-  if ((bkc & BKC_BREAKSYMLINK) || (bkc & BKC_BREAKHARDLINK)) {
+  if ((bkc & kOptBkcFlagBreaksymlink) || (bkc & kOptBkcFlagBreakhardlink)) {
 #ifdef UNIX
     bool file_info_link_ok = os_fileinfo_link(fname, &file_info);
 
     // Symlinks.
-    if ((bkc & BKC_BREAKSYMLINK)
+    if ((bkc & kOptBkcFlagBreaksymlink)
         && file_info_link_ok
         && !os_fileinfo_id_equal(&file_info, file_info_old)) {
       *backup_copyp = false;
     }
 
     // Hardlinks.
-    if ((bkc & BKC_BREAKHARDLINK)
+    if ((bkc & kOptBkcFlagBreakhardlink)
         && os_fileinfo_hardlinks(file_info_old) > 1
         && (!file_info_link_ok
             || os_fileinfo_id_equal(&file_info, file_info_old))) {
@@ -1148,6 +1147,7 @@ int buf_write(buf_T *buf, char *fname, char *sfname, linenr_T start, linenr_T en
     msg_scroll = true;              // don't overwrite previous file message
   }
   if (!filtering) {
+    msg_ext_set_kind("bufwrite");
     // show that we are busy
 #ifndef UNIX
     filemess(buf, sfname, "");
@@ -1763,6 +1763,7 @@ restore_backup:
     if (msg_add_fileformat(fileformat)) {
       insert_space = true;
     }
+    msg_ext_set_kind("bufwrite");
     msg_add_lines(insert_space, lnum, nchars);       // add line/char count
     if (!shortmess(SHM_WRITE)) {
       if (append) {