diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-05-07 20:01:16 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-05-07 20:01:16 +0100 |
| commit | 249591057b4840785c50e41dd850efb8a8faf435 (patch) | |
| tree | e9ba171529cf753e7aab0ec9adf5be3fedc17d00 /src/buffer.c | |
| parent | 9ff7d717aa3176de5c61de340deb93f41c7780fc (diff) | |
patch 8.2.4911: the mode #defines are not clearly namedv8.2.4911
Problem: The mode #defines are not clearly named.
Solution: Prepend MODE_. Renumber them to put the mapped modes first.
Diffstat (limited to 'src/buffer.c')
| -rw-r--r-- | src/buffer.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/buffer.c b/src/buffer.c index da0555e86f..17b1493800 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1774,7 +1774,7 @@ set_curbuf(buf_T *buf, int action) // another window, might be a timer doing something in another // window. if (prevbuf == curbuf - && ((State & INSERT) == 0 || curbuf->b_nwindows <= 1)) + && ((State & MODE_INSERT) == 0 || curbuf->b_nwindows <= 1)) u_sync(FALSE); close_buffer(prevbuf == curwin->w_buffer ? curwin : NULL, prevbuf, unload ? action : (action == DOBUF_GOTO @@ -4700,8 +4700,8 @@ build_stl_str_hl( break; case STL_COLUMN: - num = !(State & INSERT) && empty_line - ? 0 : (int)wp->w_cursor.col + 1; + num = (State & MODE_INSERT) == 0 && empty_line + ? 0 : (int)wp->w_cursor.col + 1; break; case STL_VIRTCOL: @@ -4709,8 +4709,8 @@ build_stl_str_hl( virtcol = wp->w_virtcol + 1; // Don't display %V if it's the same as %c. if (opt == STL_VIRTCOL_ALT - && (virtcol == (colnr_T)(!(State & INSERT) && empty_line - ? 0 : (int)wp->w_cursor.col + 1))) + && (virtcol == (colnr_T)((State & MODE_INSERT) == 0 + && empty_line ? 0 : (int)wp->w_cursor.col + 1))) break; num = (long)virtcol; break; @@ -4755,9 +4755,9 @@ build_stl_str_hl( case STL_OFFSET: #ifdef FEAT_BYTEOFF l = ml_find_line_or_offset(wp->w_buffer, wp->w_cursor.lnum, NULL); - num = (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) || l < 0 ? - 0L : l + 1 + (!(State & INSERT) && empty_line ? - 0 : (int)wp->w_cursor.col); + num = (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) || l < 0 + ? 0L : l + 1 + ((State & MODE_INSERT) == 0 && empty_line + ? 0 : (int)wp->w_cursor.col); #endif break; |