Mercurial > vim

comparison src/getchar.c @ 18763:49b78d6465e5 v8.1.2371

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
18762:19582783e5ad 18763:49b78d6465e5
1602 1602
1603 if (mod_mask 1603 if (mod_mask
1604 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) 1604 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
1605 || im_is_preediting() 1605 || im_is_preediting()
1606 #endif 1606 #endif
1607 #if defined(FEAT_TEXT_PROP) 1607 #if defined(FEAT_PROP_POPUP)
1608 || popup_no_mapping() 1608 || popup_no_mapping()
1609 #endif 1609 #endif
1610 ) 1610 )
1611 { 1611 {
1612 // no mapping after modifier has been read 1612 // no mapping after modifier has been read
1820 // Don't trigger 'balloonexpr' unless only the mouse was moved. 1820 // Don't trigger 'balloonexpr' unless only the mouse was moved.
1821 bevalexpr_due_set = FALSE; 1821 bevalexpr_due_set = FALSE;
1822 ui_remove_balloon(); 1822 ui_remove_balloon();
1823 } 1823 }
1824 #endif 1824 #endif
1825 #ifdef FEAT_TEXT_PROP 1825 #ifdef FEAT_PROP_POPUP
1826 if (popup_do_filter(c)) 1826 if (popup_do_filter(c))
1827 { 1827 {
1828 if (c == Ctrl_C) 1828 if (c == Ctrl_C)
1829 got_int = FALSE; // avoid looping 1829 got_int = FALSE; // avoid looping
1830 c = K_IGNORE; 1830 c = K_IGNORE;
2036 * text position. */ 2036 * text position. */
2037 win = mouse_find_win(&row, &col, FIND_POPUP); 2037 win = mouse_find_win(&row, &col, FIND_POPUP);
2038 if (win == NULL) 2038 if (win == NULL)
2039 return; 2039 return;
2040 (void)mouse_comp_pos(win, &row, &col, &lnum, NULL); 2040 (void)mouse_comp_pos(win, &row, &col, &lnum, NULL);
2041 #ifdef FEAT_TEXT_PROP 2041 #ifdef FEAT_PROP_POPUP
2042 if (WIN_IS_POPUP(win)) 2042 if (WIN_IS_POPUP(win))
2043 winnr = 0; 2043 winnr = 0;
2044 else 2044 else
2045 #endif 2045 #endif
2046 for (wp = firstwin; wp != win && wp != NULL; 2046 for (wp = firstwin; wp != win && wp != NULL;
2849 if (result == map_result_get) 2849 if (result == map_result_get)
2850 { 2850 {
2851 /* 2851 /*
2852 * get a character: 2. from the typeahead buffer 2852 * get a character: 2. from the typeahead buffer
2853 */ 2853 */
2854 c = typebuf.tb_buf[typebuf.tb_off] & 255; 2854 c = typebuf.tb_buf[typebuf.tb_off];
2855 if (advance) /* remove chars from tb_buf */ 2855 if (advance) /* remove chars from tb_buf */
2856 { 2856 {
2857 cmd_silent = (typebuf.tb_silent > 0); 2857 cmd_silent = (typebuf.tb_silent > 0);
2858 if (typebuf.tb_maplen > 0) 2858 if (typebuf.tb_maplen > 0)
2859 KeyTyped = FALSE; 2859 KeyTyped = FALSE;