comparison src/textformat.c @ 34194:a522c6c0127b v9.1.0047

patch 9.1.0047: issues with temp curwin/buf while cmdwin is open Commit: https://github.com/vim/vim/commit/988f74311c26ea9917e84fbae608de226dba7e5f Author: Sean Dewar <seandewar@users.noreply.github.com> Date: Wed Aug 16 14:17:36 2023 +0100 patch 9.1.0047: issues with temp curwin/buf while cmdwin is open Problem: Things that temporarily change/restore curwin/buf (e.g: win_execute, some autocmds) may break assumptions that curwin/buf is the cmdwin when "cmdwin_type != 0", causing issues. Solution: Expose the cmdwin's real win/buf and check that instead. Also try to ensure these variables are NULL if "cmdwin_type == 0", allowing them to be used directly in most cases without checking cmdwin_type. (Sean Dewar) Alternatively, we could ban win_execute in the cmdwin and audit all places that temporarily change/restore curwin/buf, but I didn't notice any problems arising from allowing this (standard cmdwin restrictions still apply, so things that may actually break the cmdwin are still forbidden). closes: #12819 Signed-off-by: Sean Dewar <seandewar@users.noreply.github.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Tue, 23 Jan 2024 23:00:04 +0100
parents 0839c759c9d1
children 19c88c3d8c43
comparison
equal deleted inserted replaced
34193:00b0bd66410b 34194:a522c6c0127b
793 if (textwidth == 0 && curbuf->b_p_wm) 793 if (textwidth == 0 && curbuf->b_p_wm)
794 { 794 {
795 // The width is the window width minus 'wrapmargin' minus all the 795 // The width is the window width minus 'wrapmargin' minus all the
796 // things that add to the margin. 796 // things that add to the margin.
797 textwidth = curwin->w_width - curbuf->b_p_wm; 797 textwidth = curwin->w_width - curbuf->b_p_wm;
798 if (cmdwin_type != 0) 798 if (curbuf == cmdwin_buf)
799 textwidth -= 1; 799 textwidth -= 1;
800 #ifdef FEAT_FOLDING 800 #ifdef FEAT_FOLDING
801 textwidth -= curwin->w_p_fdc; 801 textwidth -= curwin->w_p_fdc;
802 #endif 802 #endif
803 #ifdef FEAT_SIGNS 803 #ifdef FEAT_SIGNS