Mercurial > vim

comparison src/fileio.c @ 17095:10e0d7d96cb0 v8.1.1547

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1547: functionality of bt_nofile() is confusing commit https://github.com/vim/vim/commit/26910de8b0da6abab87bd5a397330f9cbe483309 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jun 15 19:37:15 2019 +0200 patch 8.1.1547: functionality of bt_nofile() is confusing Problem: Functionality of bt_nofile() is confusing. Solution: Split into bt_nofile() and bt_nofilename().
author Bram Moolenaar <Bram@vim.org>
date Sat, 15 Jun 2019 19:45:06 +0200
parents d5e1e09a829f
children d4b2a212fa2f
comparison
equal deleted inserted replaced
17094:8ca56a5c3141 17095:10e0d7d96cb0
3158 if (buf->b_ffname == NULL 3158 if (buf->b_ffname == NULL
3159 && reset_changed 3159 && reset_changed
3160 && whole 3160 && whole
3161 && buf == curbuf 3161 && buf == curbuf
3162 #ifdef FEAT_QUICKFIX 3162 #ifdef FEAT_QUICKFIX
3163 && !bt_nofile(buf) 3163 && !bt_nofilename(buf)
3164 #endif 3164 #endif
3165 && !filtering 3165 && !filtering
3166 && (!append || vim_strchr(p_cpo, CPO_FNAMEAPP) != NULL) 3166 && (!append || vim_strchr(p_cpo, CPO_FNAMEAPP) != NULL)
3167 && vim_strchr(p_cpo, CPO_FNAMEW) != NULL) 3167 && vim_strchr(p_cpo, CPO_FNAMEW) != NULL)
3168 { 3168 {
3235 { 3235 {
3236 if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEAPPENDCMD, 3236 if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEAPPENDCMD,
3237 sfname, sfname, FALSE, curbuf, eap))) 3237 sfname, sfname, FALSE, curbuf, eap)))
3238 { 3238 {
3239 #ifdef FEAT_QUICKFIX 3239 #ifdef FEAT_QUICKFIX
3240 if (overwriting && bt_nofile(curbuf)) 3240 if (overwriting && bt_nofilename(curbuf))
3241 nofile_err = TRUE; 3241 nofile_err = TRUE;
3242 else 3242 else
3243 #endif 3243 #endif
3244 apply_autocmds_exarg(EVENT_FILEAPPENDPRE, 3244 apply_autocmds_exarg(EVENT_FILEAPPENDPRE,
3245 sfname, sfname, FALSE, curbuf, eap); 3245 sfname, sfname, FALSE, curbuf, eap);
3268 } 3268 }
3269 } 3269 }
3270 else 3270 else
3271 { 3271 {
3272 #ifdef FEAT_QUICKFIX 3272 #ifdef FEAT_QUICKFIX
3273 if (overwriting && bt_nofile(curbuf)) 3273 if (overwriting && bt_nofilename(curbuf))
3274 nofile_err = TRUE; 3274 nofile_err = TRUE;
3275 else 3275 else
3276 #endif 3276 #endif
3277 apply_autocmds_exarg(EVENT_BUFWRITEPRE, 3277 apply_autocmds_exarg(EVENT_BUFWRITEPRE,
3278 sfname, sfname, FALSE, curbuf, eap); 3278 sfname, sfname, FALSE, curbuf, eap);
3282 { 3282 {
3283 if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEWRITECMD, 3283 if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEWRITECMD,
3284 sfname, sfname, FALSE, curbuf, eap))) 3284 sfname, sfname, FALSE, curbuf, eap)))
3285 { 3285 {
3286 #ifdef FEAT_QUICKFIX 3286 #ifdef FEAT_QUICKFIX
3287 if (overwriting && bt_nofile(curbuf)) 3287 if (overwriting && bt_nofilename(curbuf))
3288 nofile_err = TRUE; 3288 nofile_err = TRUE;
3289 else 3289 else
3290 #endif 3290 #endif
3291 apply_autocmds_exarg(EVENT_FILEWRITEPRE, 3291 apply_autocmds_exarg(EVENT_FILEWRITEPRE,
3292 sfname, sfname, FALSE, curbuf, eap); 3292 sfname, sfname, FALSE, curbuf, eap);
6081 { 6081 {
6082 char_u *p; 6082 char_u *p;
6083 6083
6084 if (buf->b_fname != NULL 6084 if (buf->b_fname != NULL
6085 #ifdef FEAT_QUICKFIX 6085 #ifdef FEAT_QUICKFIX
6086 && !bt_nofile(buf) 6086 && !bt_nofilename(buf)
6087 #endif 6087 #endif
6088 && !path_with_url(buf->b_fname) 6088 && !path_with_url(buf->b_fname)
6089 && (force 6089 && (force
6090 || buf->b_sfname == NULL 6090 || buf->b_sfname == NULL
6091 || mch_isFullName(buf->b_sfname))) 6091 || mch_isFullName(buf->b_sfname)))