diff options
| author | Marco Hinz <mh.codebro@gmail.com> | 2017-01-09 14:35:04 +0100 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-02-04 17:55:46 -0500 |
| commit | c05e7f0fdd15d550cfb1054416a08d4514a4fb7e (patch) | |
| tree | ac051f64de7006efe1463da9e549e7c507817683 /src/nvim/buffer.h | |
| parent | e3b92c77da0277c8d58e037e42c5b929be469284 (diff) | |
| download | rneovim-c05e7f0fdd15d550cfb1054416a08d4514a4fb7e.tar.gz rneovim-c05e7f0fdd15d550cfb1054416a08d4514a4fb7e.tar.bz2 rneovim-c05e7f0fdd15d550cfb1054416a08d4514a4fb7e.zip | |
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
Diffstat (limited to 'src/nvim/buffer.h')
| -rw-r--r-- | src/nvim/buffer.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h index 1fe8692963..64f9daf0a8 100644 --- a/src/nvim/buffer.h +++ b/src/nvim/buffer.h @@ -57,21 +57,22 @@ enum bfa_values { static inline void switch_to_win_for_buf(buf_T *buf, win_T **save_curwinp, tabpage_T **save_curtabp, - buf_T **save_curbufp) + bufref_T *save_curbuf) { win_T *wp; tabpage_T *tp; if (!find_win_for_buf(buf, &wp, &tp) - || switch_win(save_curwinp, save_curtabp, wp, tp, true) == FAIL) - switch_buffer(save_curbufp, buf); + || switch_win(save_curwinp, save_curtabp, wp, tp, true) == FAIL) { + switch_buffer(save_curbuf, buf); + } } static inline void restore_win_for_buf(win_T *save_curwin, tabpage_T *save_curtab, - buf_T *save_curbuf) + bufref_T *save_curbuf) { - if (save_curbuf == NULL) { + if (save_curbuf->br_buf == NULL) { restore_win(save_curwin, save_curtab, true); } else { restore_buffer(save_curbuf); |