Mercurial > vim
comparison src/main.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 | bbea1f108187 |
children | f41b55f9357c |
comparison
equal
deleted
inserted
replaced
18762:19582783e5ad | 18763:49b78d6465e5 |
---|---|
1281 #endif | 1281 #endif |
1282 | 1282 |
1283 /* Trigger CursorMoved if the cursor moved. */ | 1283 /* Trigger CursorMoved if the cursor moved. */ |
1284 if (!finish_op && ( | 1284 if (!finish_op && ( |
1285 has_cursormoved() | 1285 has_cursormoved() |
1286 #ifdef FEAT_TEXT_PROP | 1286 #ifdef FEAT_PROP_POPUP |
1287 || popup_visible | 1287 || popup_visible |
1288 #endif | 1288 #endif |
1289 #ifdef FEAT_CONCEAL | 1289 #ifdef FEAT_CONCEAL |
1290 || curwin->w_p_cole > 0 | 1290 || curwin->w_p_cole > 0 |
1291 #endif | 1291 #endif |
1293 && !EQUAL_POS(last_cursormoved, curwin->w_cursor)) | 1293 && !EQUAL_POS(last_cursormoved, curwin->w_cursor)) |
1294 { | 1294 { |
1295 if (has_cursormoved()) | 1295 if (has_cursormoved()) |
1296 apply_autocmds(EVENT_CURSORMOVED, NULL, NULL, | 1296 apply_autocmds(EVENT_CURSORMOVED, NULL, NULL, |
1297 FALSE, curbuf); | 1297 FALSE, curbuf); |
1298 #ifdef FEAT_TEXT_PROP | 1298 #ifdef FEAT_PROP_POPUP |
1299 if (popup_visible) | 1299 if (popup_visible) |
1300 popup_check_cursor_pos(); | 1300 popup_check_cursor_pos(); |
1301 #endif | 1301 #endif |
1302 #ifdef FEAT_CONCEAL | 1302 #ifdef FEAT_CONCEAL |
1303 if (curwin->w_p_cole > 0) | 1303 if (curwin->w_p_cole > 0) |