diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-30 22:48:27 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-30 22:48:27 +0100 |
| commit | 05ad5ff0ab34ed9a5296dedd420ca81698b8ce22 (patch) | |
| tree | 7354d352e37ab28988ce26e4f88efd9a9b9f71ec /src/edit.c | |
| parent | 0c5c3faef2d54151a8c144539e3e5a3350fb18c7 (diff) | |
patch 8.1.2371: FEAT_TEXT_PROP is a confusing namev8.1.2371
Problem: FEAT_TEXT_PROP is a confusing name.
Solution: Use FEAT_PROP_POPUP. (Naruhiko Nishino, closes #5291)
Diffstat (limited to 'src/edit.c')
| -rw-r--r-- | src/edit.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/edit.c b/src/edit.c index e1bf63db93..4f53333cde 100644 --- a/src/edit.c +++ b/src/edit.c @@ -1417,7 +1417,7 @@ ins_redraw(int ready) // not busy with something /* Trigger CursorMoved if the cursor moved. Not when the popup menu is * visible, the command might delete it. */ if (ready && (has_cursormovedI() -# ifdef FEAT_TEXT_PROP +# ifdef FEAT_PROP_POPUP || popup_visible # endif # if defined(FEAT_CONCEAL) @@ -1442,7 +1442,7 @@ ins_redraw(int ready) // not busy with something update_curswant(); ins_apply_autocmds(EVENT_CURSORMOVEDI); } -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP if (popup_visible) popup_check_cursor_pos(); #endif @@ -3775,7 +3775,7 @@ replace_do_bs(int limit_col) cc = replace_pop(); if (cc > 0) { -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP size_t len_before = 0; // init to shut up GCC if (curbuf->b_has_textprop) @@ -3835,7 +3835,7 @@ replace_do_bs(int limit_col) // mark the buffer as changed and prepare for displaying changed_bytes(curwin->w_cursor.lnum, curwin->w_cursor.col); -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP if (curbuf->b_has_textprop) { size_t len_now = STRLEN(ml_get_curline()); @@ -4807,7 +4807,7 @@ ins_bs( } /* - * Delete upto starting point, start of line or previous word. + * Delete up to starting point, start of line or previous word. */ else { @@ -5609,7 +5609,7 @@ ins_tab(void) if ((State & REPLACE_FLAG) && !(State & VREPLACE_FLAG)) for (temp = i; --temp >= 0; ) replace_join(repl_off); -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP curbuf->b_ml.ml_line_len -= i; #endif } |