Mercurial > vim

comparison src/option.c @ 10357:59d01e335858 v8.0.0073

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 54249c31882a
children 66f1b5bf3fa6
comparison
equal deleted inserted replaced
10356:49b1b87c4802 10357:59d01e335858
8549 errmsg = e_positive; 8549 errmsg = e_positive;
8550 p_hh = 0; 8550 p_hh = 0;
8551 } 8551 }
8552 8552
8553 /* Change window height NOW */ 8553 /* Change window height NOW */
8554 if (lastwin != firstwin) 8554 if (!ONE_WINDOW)
8555 { 8555 {
8556 if (pp == &p_wh && curwin->w_height < p_wh) 8556 if (pp == &p_wh && curwin->w_height < p_wh)
8557 win_setheight((int)p_wh); 8557 win_setheight((int)p_wh);
8558 if (pp == &p_hh && curbuf->b_help && curwin->w_height < p_hh) 8558 if (pp == &p_hh && curbuf->b_help && curwin->w_height < p_hh)
8559 win_setheight((int)p_hh); 8559 win_setheight((int)p_hh);
8589 errmsg = e_winwidth; 8589 errmsg = e_winwidth;
8590 p_wiw = p_wmw; 8590 p_wiw = p_wmw;
8591 } 8591 }
8592 8592
8593 /* Change window width NOW */ 8593 /* Change window width NOW */
8594 if (lastwin != firstwin && curwin->w_width < p_wiw) 8594 if (!ONE_WINDOW && curwin->w_width < p_wiw)
8595 win_setwidth((int)p_wiw); 8595 win_setwidth((int)p_wiw);
8596 } 8596 }
8597 8597
8598 /* 'winminwidth' */ 8598 /* 'winminwidth' */
8599 else if (pp == &p_wmw) 8599 else if (pp == &p_wmw)
10073 10073
10074 void 10074 void
10075 comp_col(void) 10075 comp_col(void)
10076 { 10076 {
10077 #if defined(FEAT_CMDL_INFO) && defined(FEAT_WINDOWS) 10077 #if defined(FEAT_CMDL_INFO) && defined(FEAT_WINDOWS)
10078 int last_has_status = (p_ls == 2 || (p_ls == 1 && firstwin != lastwin)); 10078 int last_has_status = (p_ls == 2 || (p_ls == 1 && !ONE_WINDOW));
10079 10079
10080 sc_col = 0; 10080 sc_col = 0;
10081 ru_col = 0; 10081 ru_col = 0;
10082 if (p_ru) 10082 if (p_ru)
10083 { 10083 {