Mercurial > vim
diff src/getchar.c @ 18763:49b78d6465e5 v8.1.2371
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Commit: https://github.com/vim/vim/commit/05ad5ff0ab34ed9a5296dedd420ca81698b8ce22
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Nov 30 22:48:27 2019 +0100
patch 8.1.2371: FEAT_TEXT_PROP is a confusing name
Problem: FEAT_TEXT_PROP is a confusing name.
Solution: Use FEAT_PROP_POPUP. (Naruhiko Nishino, closes https://github.com/vim/vim/issues/5291)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 30 Nov 2019 23:00:05 +0100 |
| parents | 14d2a210fab1 |
| children | 79e10adc821d |
line wrap: on
line diff
--- 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 *r 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);