Mercurial > vim
comparison src/gui.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 | fd95d4dbeb37 |
children | 79e10adc821d |
comparison
equal
deleted
inserted
replaced
18762:19582783e5ad | 18763:49b78d6465e5 |
---|---|
4896 return; | 4896 return; |
4897 | 4897 |
4898 // apply 'mousefocus' and pointer shape | 4898 // apply 'mousefocus' and pointer shape |
4899 gui_mouse_focus(x, y); | 4899 gui_mouse_focus(x, y); |
4900 | 4900 |
4901 #ifdef FEAT_TEXT_PROP | 4901 #ifdef FEAT_PROP_POPUP |
4902 if (popup_visible) | 4902 if (popup_visible) |
4903 // Generate a mouse-moved event, so that the popup can perhaps be | 4903 // Generate a mouse-moved event, so that the popup can perhaps be |
4904 // closed, just like in the terminal. | 4904 // closed, just like in the terminal. |
4905 gui_send_mouse_event(MOUSE_DRAG, x, y, FALSE, 0); | 4905 gui_send_mouse_event(MOUSE_DRAG, x, y, FALSE, 0); |
4906 #endif | 4906 #endif |
5150 update_topline(); | 5150 update_topline(); |
5151 validate_cursor(); | 5151 validate_cursor(); |
5152 | 5152 |
5153 /* Trigger CursorMoved if the cursor moved. */ | 5153 /* Trigger CursorMoved if the cursor moved. */ |
5154 if (!finish_op && (has_cursormoved() | 5154 if (!finish_op && (has_cursormoved() |
5155 # ifdef FEAT_TEXT_PROP | 5155 # ifdef FEAT_PROP_POPUP |
5156 || popup_visible | 5156 || popup_visible |
5157 # endif | 5157 # endif |
5158 # ifdef FEAT_CONCEAL | 5158 # ifdef FEAT_CONCEAL |
5159 || curwin->w_p_cole > 0 | 5159 || curwin->w_p_cole > 0 |
5160 # endif | 5160 # endif |
5161 ) && !EQUAL_POS(last_cursormoved, curwin->w_cursor)) | 5161 ) && !EQUAL_POS(last_cursormoved, curwin->w_cursor)) |
5162 { | 5162 { |
5163 if (has_cursormoved()) | 5163 if (has_cursormoved()) |
5164 apply_autocmds(EVENT_CURSORMOVED, NULL, NULL, FALSE, curbuf); | 5164 apply_autocmds(EVENT_CURSORMOVED, NULL, NULL, FALSE, curbuf); |
5165 #ifdef FEAT_TEXT_PROP | 5165 #ifdef FEAT_PROP_POPUP |
5166 if (popup_visible) | 5166 if (popup_visible) |
5167 popup_check_cursor_pos(); | 5167 popup_check_cursor_pos(); |
5168 #endif | 5168 #endif |
5169 # ifdef FEAT_CONCEAL | 5169 # ifdef FEAT_CONCEAL |
5170 if (curwin->w_p_cole > 0) | 5170 if (curwin->w_p_cole > 0) |