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/ex_cmds.c | |
| parent | 0c5c3faef2d54151a8c144539e3e5a3350fb18c7 (diff) | |
| download | vim-git-05ad5ff0ab34ed9a5296dedd420ca81698b8ce22.tar.gz | |
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/ex_cmds.c')
| -rw-r--r-- | src/ex_cmds.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/ex_cmds.c b/src/ex_cmds.c index 95766683c..78f2bcc6b 100644 --- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2953,7 +2953,7 @@ do_ecmd( topline = curwin->w_topline; if (!oldbuf) /* need to read the file */ { -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP // Don't use the swap-exists dialog for a popup window, can't edit // the buffer. if (WIN_IS_POPUP(curwin)) @@ -2972,7 +2972,7 @@ do_ecmd( (void)open_buffer(FALSE, eap, readfile_flags); #endif -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP curbuf->b_flags &= ~BF_NO_SEA; #endif if (swap_exists_action == SEA_QUIT) @@ -3016,7 +3016,7 @@ do_ecmd( #ifdef FEAT_TITLE maketitle(); #endif -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP if (WIN_IS_POPUP(curwin) && curwin->w_p_pvw && retval != FAIL) popup_set_title(curwin); #endif @@ -3900,7 +3900,7 @@ do_sub(exarg_T *eap) int do_again; /* do it again after joining lines */ int skip_match = FALSE; linenr_T sub_firstlnum; /* nr of first sub line */ -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP int apc_flags = APC_SAVE_FOR_UNDO | APC_SUBSTITUTE; colnr_T total_added = 0; #endif @@ -4317,7 +4317,7 @@ do_sub(exarg_T *eap) if (nmatch == 1) { p1 = sub_firstline; -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP if (curbuf->b_has_textprop) { int bytes_added = sublen - 1 - (regmatch.endpos[0].col @@ -4435,7 +4435,7 @@ do_sub(exarg_T *eap) if (p1[0] == '\\' && p1[1] != NUL) /* remove backslash */ { STRMOVE(p1, p1 + 1); -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP if (curbuf->b_has_textprop) { // When text properties are changed, need to save @@ -4464,7 +4464,7 @@ do_sub(exarg_T *eap) first_line = lnum; last_line = lnum + 1; } -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP adjust_props_for_split(lnum + 1, lnum, plen, 1); #endif // all line numbers increase @@ -4993,7 +4993,7 @@ prepare_tagpreview( */ if (!curwin->w_p_pvw) { -# ifdef FEAT_TEXT_PROP +# ifdef FEAT_PROP_POPUP if (use_previewpopup && *p_pvp != NUL) { wp = popup_find_preview_window(); @@ -5028,7 +5028,7 @@ prepare_tagpreview( /* * There is no preview window open yet. Create one. */ -# ifdef FEAT_TEXT_PROP +# ifdef FEAT_PROP_POPUP if ((use_previewpopup && *p_pvp != NUL) || use_popup != USEPOPUP_NONE) return popup_create_preview_window(use_popup != USEPOPUP_NONE); |