diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2018-06-22 09:53:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-22 09:53:46 +0200 |
| commit | bf2460e2f980697be54090bdaa6b1bdc618b3791 (patch) | |
| tree | 9997df764fabad0f60b2aaf81f5935a3f702ff60 /src/nvim/buffer.c | |
| parent | e1c6109e62b4e1d12ebdab67140f82cc7dc2c0d1 (diff) | |
| parent | 8917e0c3010f93d6238bda21c4807c6c5921eb4a (diff) | |
| download | rneovim-bf2460e2f980697be54090bdaa6b1bdc618b3791.tar.gz rneovim-bf2460e2f980697be54090bdaa6b1bdc618b3791.tar.bz2 rneovim-bf2460e2f980697be54090bdaa6b1bdc618b3791.zip | |
Merge pull request #7551 from bfredl/setl_bufwin
fix copying setl options for buffer currently displayed in another window
Diffstat (limited to 'src/nvim/buffer.c')
| -rw-r--r-- | src/nvim/buffer.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index ae535354f8..19c17a9d68 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -2381,8 +2381,15 @@ void get_winopts(buf_T *buf) clear_winopt(&curwin->w_onebuf_opt); clearFolding(curwin); - wip = find_wininfo(buf, TRUE); - if (wip != NULL && wip->wi_optset) { + wip = find_wininfo(buf, true); + if (wip != NULL && wip->wi_win != curwin && wip->wi_win != NULL + && wip->wi_win->w_buffer == buf) { + win_T *wp = wip->wi_win; + copy_winopt(&wp->w_onebuf_opt, &curwin->w_onebuf_opt); + curwin->w_fold_manual = wp->w_fold_manual; + curwin->w_foldinvalid = true; + cloneFoldGrowArray(&wp->w_folds, &curwin->w_folds); + } else if (wip != NULL && wip->wi_optset) { copy_winopt(&wip->wi_opt, &curwin->w_onebuf_opt); curwin->w_fold_manual = wip->wi_fold_manual; curwin->w_foldinvalid = true; |