diff options
Diffstat (limited to 'src/nvim/buffer.c')
| -rw-r--r-- | src/nvim/buffer.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index b1f44277c7..19c17a9d68 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -343,7 +343,7 @@ open_buffer ( void set_bufref(bufref_T *bufref, buf_T *buf) { bufref->br_buf = buf; - bufref->br_fnum = buf->b_fnum; + bufref->br_fnum = buf == NULL ? 0 : buf->b_fnum; bufref->br_buf_free_count = buf_free_count; } @@ -1555,7 +1555,7 @@ static inline void buf_init_changedtick(buf_T *const buf) .di_tv = (typval_T) { .v_type = VAR_NUMBER, .v_lock = VAR_FIXED, - .vval.v_number = buf->b_changedtick, + .vval.v_number = buf_get_changedtick(buf), }, .di_key = "changedtick", }; @@ -1901,10 +1901,10 @@ int buflist_getfile(int n, linenr_T lnum, int options, int forceit) } } - ++RedrawingDisabled; - if (getfile(buf->b_fnum, NULL, NULL, (options & GETF_SETMARK), - lnum, forceit) <= 0) { - --RedrawingDisabled; + RedrawingDisabled++; + if (GETFILE_SUCCESS(getfile(buf->b_fnum, NULL, NULL, + (options & GETF_SETMARK), lnum, forceit))) { + RedrawingDisabled--; /* cursor is at to BOL and w_cursor.lnum is checked due to getfile() */ if (!p_sol && col != 0) { @@ -1915,7 +1915,7 @@ int buflist_getfile(int n, linenr_T lnum, int options, int forceit) } return OK; } - --RedrawingDisabled; + RedrawingDisabled--; return FAIL; } |