From c05e7f0fdd15d550cfb1054416a08d4514a4fb7e Mon Sep 17 00:00:00 2001 From: Marco Hinz Date: Mon, 9 Jan 2017 14:35:04 +0100 Subject: vim-patch:7.4.2024 Problem: More buf_valid() calls can be optimized. Solution: Use bufref_valid() instead. NOTE: Some changes related to channels and the Python and Netbeans interfaces were obviously left out. https://github.com/vim/vim/commit/7c0a2f367f2507669560b1a66423155c70d2e75b --- src/nvim/diff.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/nvim/diff.c') diff --git a/src/nvim/diff.c b/src/nvim/diff.c index f7b96ba3e1..aafd50687e 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -1004,7 +1004,8 @@ theend: void ex_diffsplit(exarg_T *eap) { win_T *old_curwin = curwin; - buf_T *old_curbuf = curbuf; + bufref_T old_curbuf; + set_bufref(&old_curbuf, curbuf); // don't use a new tab page, each tab page has its own diffs cmdmod.tab = 0; @@ -1022,10 +1023,10 @@ void ex_diffsplit(exarg_T *eap) if (win_valid(old_curwin)) { diff_win_options(old_curwin, true); - if (buf_valid(old_curbuf)) { + if (bufref_valid(&old_curbuf)) { // Move the cursor position to that of the old window. curwin->w_cursor.lnum = diff_get_corresponding_line( - old_curbuf, + old_curbuf.br_buf, old_curwin->w_cursor.lnum, curbuf, curwin->w_cursor.lnum); -- cgit