Mercurial > vim
diff src/misc1.c @ 12515:972ea22c946f v8.0.1136
patch 8.0.1136: W_WIDTH() is always the same
commit https://github.com/vim/vim/commit/0263146b5dbbb6c120ce2e7720256503b864425d
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Sep 22 15:20:32 2017 +0200
patch 8.0.1136: W_WIDTH() is always the same
Problem: W_WIDTH() is always the same.
Solution: Expand the macro.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 22 Sep 2017 15:30:06 +0200 |
| parents | 68d7bc045dbe |
| children | fad36581f788 |
line wrap: on
line diff
--- a/src/misc1.c +++ b/src/misc1.c @@ -495,7 +495,7 @@ get_breakindent_win( static varnumber_T prev_tick = 0; /* changedtick of cached value */ int bri = 0; /* window width minus window margin space, i.e. what rests for text */ - const int eff_wwidth = W_WIDTH(wp) + const int eff_wwidth = wp->w_width - ((wp->w_p_nu || wp->w_p_rnu) && (vim_strchr(p_cpo, CPO_NUMCOL) == NULL) ? number_width(wp) + 1 : 0); @@ -2026,7 +2026,7 @@ plines_win_nofold(win_T *wp, linenr_T ln /* * Add column offset for 'number', 'relativenumber' and 'foldcolumn'. */ - width = W_WIDTH(wp) - win_col_off(wp); + width = wp->w_width - win_col_off(wp); if (width <= 0) return 32000; if (col <= width) @@ -2083,7 +2083,7 @@ plines_win_col(win_T *wp, linenr_T lnum, /* * Add column offset for 'number', 'relativenumber', 'foldcolumn', etc. */ - width = W_WIDTH(wp) - win_col_off(wp); + width = wp->w_width - win_col_off(wp); if (width <= 0) return 9999;