aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00
Code Activity

patch 8.1.2371: FEAT_TEXT_PROP is a confusing name

Browse Source 
Problem:    FEAT_TEXT_PROP is a confusing name.
Solution:   Use FEAT_PROP_POPUP. (Naruhiko Nishino, closes #5291)
This commit is contained in:
Bram Moolenaar
2019-11-30 22:48:27 +01:00
parent 0c5c3faef2
commit 05ad5ff0ab
47 changed files with 190 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/edit.c
View File

@@ -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
}