Mercurial > vim
diff src/channel.c @ 11959:91a26b7a4119 v8.0.0860
patch 8.0.0860: side effects when channel appends to a buffer
commit https://github.com/vim/vim/commit/6b7355a30ddd294c19cd9be924d487d592ccfae1
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Aug 4 21:37:54 2017 +0200
patch 8.0.0860: side effects when channel appends to a buffer
Problem: There may be side effects when a channel appends to a buffer that
is not the current buffer.
Solution: Properly switch to another buffer before appending. (Yasuhiro
Matsumoto, closes #1926, closes #1937)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 04 Aug 2017 21:45:04 +0200 |
| parents | ef1febf04d03 |
| children | 12833414cc02 |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -2284,7 +2284,9 @@ invoke_one_time_callback( static void append_to_buffer(buf_T *buffer, char_u *msg, channel_T *channel, ch_part_T part) { - buf_T *save_curbuf = curbuf; + bufref_T save_curbuf = {NULL, 0, 0}; + win_T *save_curwin = NULL; + tabpage_T *save_curtab = NULL; linenr_T lnum = buffer->b_ml.ml_line_count; int save_write_to = buffer->b_write_to_channel; chanpart_T *ch_part = &channel->ch_part[part]; @@ -2313,8 +2315,10 @@ append_to_buffer(buf_T *buffer, char_u * ch_log(channel, "appending line %d to buffer", (int)lnum + 1 - empty); buffer->b_p_ma = TRUE; - curbuf = buffer; - curwin->w_buffer = curbuf; + + /* Save curbuf/curwin/curtab and make "buffer" the current buffer. */ + switch_to_win_for_buf(buffer, &save_curwin, &save_curtab, &save_curbuf); + u_sync(TRUE); /* ignore undo failure, undo is not very useful here */ ignored = u_save(lnum - empty, lnum + 1); @@ -2328,8 +2332,10 @@ append_to_buffer(buf_T *buffer, char_u * else ml_append(lnum, msg, 0, FALSE); appended_lines_mark(lnum, 1L); - curbuf = save_curbuf; - curwin->w_buffer = curbuf; + + /* Restore curbuf/curwin/curtab */ + restore_win_for_buf(save_curwin, save_curtab, &save_curbuf); + if (ch_part->ch_nomodifiable) buffer->b_p_ma = FALSE; else @@ -2338,7 +2344,6 @@ append_to_buffer(buf_T *buffer, char_u * if (buffer->b_nwindows > 0) { win_T *wp; - win_T *save_curwin; FOR_ALL_WINDOWS(wp) {