Mercurial > vim

comparison src/ex_cmds2.c @ 34780:54890be01c00 v9.1.0265

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.1.0265: console dialog cannot save unnamed buffers Commit: https://github.com/vim/vim/commit/df46115fc839c8912ed60646e86a412e5180ba1d Author: glepnir <glephunter@gmail.com> Date: Thu Apr 4 22:23:29 2024 +0200 patch 9.1.0265: console dialog cannot save unnamed buffers Problem: console dialog cannot save unnamed buffers Solution: set bufname before save (glepnir). Define dialog_con_gui to test for GUI+Console dialog support, use it to skip the test when the GUI feature has been defined. Note: The dialog_changed() function will also try to call the browse_save_fname() function, when FEAT_BROWSE is defined (which is only defined in a GUI build of Vim). This will eventually lead to a call of do_browse(), which causes an error message if a GUI is not currently running (see the TODO: in do_browse()) and will then lead to a failure in Test_goto_buf_with_onfirm(). Therefore, we must disable the Test_goto_buf_with_onfirm(), when the dialog_con_gui feature is enabled (which basically means dialog feature for GUI and Console builds, in contrast to the dialog_con and dialog_gui feature). (Previously this wasn't a problem, because the test aborted in the YES case for the :confirm :b XgotoConf case and did therefore not run into the browse function call) closes: #14398 Signed-off-by: glepnir <glephunter@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Thu, 04 Apr 2024 23:45:02 +0200
parents 4da97f213d15
children e27831e54542
comparison
equal deleted inserted replaced
34779:5914f369ff5b 34780:54890be01c00
161 int checkall) // may abandon all changed buffers 161 int checkall) // may abandon all changed buffers
162 { 162 {
163 char_u buff[DIALOG_MSG_SIZE]; 163 char_u buff[DIALOG_MSG_SIZE];
164 int ret; 164 int ret;
165 buf_T *buf2; 165 buf_T *buf2;
166 exarg_T ea; 166 exarg_T ea;
167 int empty_buf = buf->b_fname == NULL ? TRUE : FALSE;
167 168
168 dialog_msg(buff, _("Save changes to \"%s\"?"), buf->b_fname); 169 dialog_msg(buff, _("Save changes to \"%s\"?"), buf->b_fname);
169 if (checkall) 170 if (checkall)
170 ret = vim_dialog_yesnoallcancel(VIM_QUESTION, NULL, buff, 1); 171 ret = vim_dialog_yesnoallcancel(VIM_QUESTION, NULL, buff, 1);
171 else 172 else
179 { 180 {
180 #ifdef FEAT_BROWSE 181 #ifdef FEAT_BROWSE
181 // May get file name, when there is none 182 // May get file name, when there is none
182 browse_save_fname(buf); 183 browse_save_fname(buf);
183 #endif 184 #endif
184 if (buf->b_fname != NULL && check_overwrite(&ea, buf, 185 if (empty_buf)
185 buf->b_fname, buf->b_ffname, FALSE) == OK) 186 buf_set_name(buf->b_fnum, (char_u *)"Untitled");
187
188 if (check_overwrite(&ea, buf, buf->b_fname, buf->b_ffname, FALSE) == OK)
189 {
186 // didn't hit Cancel 190 // didn't hit Cancel
187 (void)buf_write_all(buf, FALSE); 191 if (buf_write_all(buf, FALSE) == OK)
192 return;
193 }
194
195 // restore to empty when write failed
196 if (empty_buf)
197 {
198 vim_free(buf->b_fname);
199 buf->b_fname = NULL;
200 vim_free(buf->b_ffname);
201 buf->b_ffname = NULL;
202 vim_free(buf->b_sfname);
203 buf->b_sfname = NULL;
204 unchanged(buf, TRUE, FALSE);
205 }
188 } 206 }
189 else if (ret == VIM_NO) 207 else if (ret == VIM_NO)
190 { 208 {
191 unchanged(buf, TRUE, FALSE); 209 unchanged(buf, TRUE, FALSE);
192 } 210 }