Mercurial > vim
comparison src/buffer.c @ 10357:59d01e335858 v8.0.0073
commit https://github.com/vim/vim/commit/459ca563128f2edb7e3bb190090bbb755a56dd55
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Nov 10 18:16:33 2016 +0100
patch 8.0.0073
Problem: More comparisons between firstwin and lastwin.
Solution: Use ONE_WINDOW for consistency. (Hirohito Higashi)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 10 Nov 2016 18:30:05 +0100 |
parents | cf988222b150 |
children | 262f5bc3d38e |
comparison
equal
deleted
inserted
replaced
10356:49b1b87c4802 | 10357:59d01e335858 |
---|---|
1410 */ | 1410 */ |
1411 while (buf == curbuf | 1411 while (buf == curbuf |
1412 # ifdef FEAT_AUTOCMD | 1412 # ifdef FEAT_AUTOCMD |
1413 && !(curwin->w_closing || curwin->w_buffer->b_locked > 0) | 1413 && !(curwin->w_closing || curwin->w_buffer->b_locked > 0) |
1414 # endif | 1414 # endif |
1415 && (firstwin != lastwin || first_tabpage->tp_next != NULL)) | 1415 && (!ONE_WINDOW || first_tabpage->tp_next != NULL)) |
1416 { | 1416 { |
1417 if (win_close(curwin, FALSE) == FAIL) | 1417 if (win_close(curwin, FALSE) == FAIL) |
1418 break; | 1418 break; |
1419 } | 1419 } |
1420 #endif | 1420 #endif |
5138 ? wp->w_height + wp->w_status_height < Rows - p_ch | 5138 ? wp->w_height + wp->w_status_height < Rows - p_ch |
5139 - tabline_height() | 5139 - tabline_height() |
5140 : wp->w_width != Columns) | 5140 : wp->w_width != Columns) |
5141 || (had_tab > 0 && wp != firstwin) | 5141 || (had_tab > 0 && wp != firstwin) |
5142 #endif | 5142 #endif |
5143 ) && firstwin != lastwin | 5143 ) && !ONE_WINDOW |
5144 #ifdef FEAT_AUTOCMD | 5144 #ifdef FEAT_AUTOCMD |
5145 && !(wp->w_closing || wp->w_buffer->b_locked > 0) | 5145 && !(wp->w_closing || wp->w_buffer->b_locked > 0) |
5146 #endif | 5146 #endif |
5147 ) | 5147 ) |
5148 { | 5148 { |