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

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 81b791a843bc
children af861fccc309
comparison
equal deleted inserted replaced
17094:8ca56a5c3141 17095:10e0d7d96cb0
9907 { 9907 {
9908 if (ses_do_win(wp) 9908 if (ses_do_win(wp)
9909 && wp->w_buffer->b_ffname != NULL 9909 && wp->w_buffer->b_ffname != NULL
9910 && !bt_help(wp->w_buffer) 9910 && !bt_help(wp->w_buffer)
9911 #ifdef FEAT_QUICKFIX 9911 #ifdef FEAT_QUICKFIX
9912 && !bt_nofile(wp->w_buffer) 9912 && !bt_nofilename(wp->w_buffer)
9913 #endif 9913 #endif
9914 ) 9914 )
9915 { 9915 {
9916 if (need_tabnext && put_line(fd, "tabnext") == FAIL) 9916 if (need_tabnext && put_line(fd, "tabnext") == FAIL)
9917 return FAIL; 9917 return FAIL;
10234 && term_should_restore(wp->w_buffer); 10234 && term_should_restore(wp->w_buffer);
10235 #endif 10235 #endif
10236 if (wp->w_buffer->b_fname == NULL 10236 if (wp->w_buffer->b_fname == NULL
10237 #ifdef FEAT_QUICKFIX 10237 #ifdef FEAT_QUICKFIX
10238 /* When 'buftype' is "nofile" can't restore the window contents. */ 10238 /* When 'buftype' is "nofile" can't restore the window contents. */
10239 || bt_nofile(wp->w_buffer) 10239 || bt_nofilename(wp->w_buffer)
10240 #endif 10240 #endif
10241 ) 10241 )
10242 return (ssop_flags & SSOP_BLANK); 10242 return (ssop_flags & SSOP_BLANK);
10243 if (bt_help(wp->w_buffer)) 10243 if (bt_help(wp->w_buffer))
10244 return (ssop_flags & SSOP_HELP); 10244 return (ssop_flags & SSOP_HELP);
10321 /* 10321 /*
10322 * Load the file. 10322 * Load the file.
10323 */ 10323 */
10324 if (wp->w_buffer->b_ffname != NULL 10324 if (wp->w_buffer->b_ffname != NULL
10325 # ifdef FEAT_QUICKFIX 10325 # ifdef FEAT_QUICKFIX
10326 && !bt_nofile(wp->w_buffer) 10326 && !bt_nofilename(wp->w_buffer)
10327 # endif 10327 # endif
10328 ) 10328 )
10329 { 10329 {
10330 /* 10330 /*
10331 * Editing a file in this buffer: use ":edit file". 10331 * Editing a file in this buffer: use ":edit file".