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/getchar.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/getchar.c')
-rw-r--r-- | src/getchar.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/getchar.c b/src/getchar.c index a3af87999..d8d498e7d 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -1604,7 +1604,7 @@ vgetc(void) #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) || im_is_preediting() #endif -#if defined(FEAT_TEXT_PROP) +#if defined(FEAT_PROP_POPUP) || popup_no_mapping() #endif ) @@ -1822,7 +1822,7 @@ vgetc(void) ui_remove_balloon(); } #endif -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP if (popup_do_filter(c)) { if (c == Ctrl_C) @@ -2038,7 +2038,7 @@ f_getchar(typval_T *argvars, typval_T *rettv) if (win == NULL) return; (void)mouse_comp_pos(win, &row, &col, &lnum, NULL); -#ifdef FEAT_TEXT_PROP +#ifdef FEAT_PROP_POPUP if (WIN_IS_POPUP(win)) winnr = 0; else @@ -2851,7 +2851,7 @@ vgetorpeek(int advance) /* * get a character: 2. from the typeahead buffer */ - c = typebuf.tb_buf[typebuf.tb_off] & 255; + c = typebuf.tb_buf[typebuf.tb_off]; if (advance) /* remove chars from tb_buf */ { cmd_silent = (typebuf.tb_silent > 0); |