Mercurial > vim

comparison src/search.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 a13370d92f9d
children d34ec6fe207d
comparison
equal deleted inserted replaced
18762:19582783e5ad 18763:49b78d6465e5
2861 func = decl; 2861 func = decl;
2862 2862
2863 while (count--) 2863 while (count--)
2864 { 2864 {
2865 /* 2865 /*
2866 * if on an empty line, skip upto a non-empty line 2866 * if on an empty line, skip up to a non-empty line
2867 */ 2867 */
2868 if (gchar_pos(&pos) == NUL) 2868 if (gchar_pos(&pos) == NUL)
2869 { 2869 {
2870 do 2870 do
2871 if ((*func)(&pos) == -1) 2871 if ((*func)(&pos) == -1)
5722 /* Return cursor to where we were */ 5722 /* Return cursor to where we were */
5723 validate_cursor(); 5723 validate_cursor();
5724 redraw_later(VALID); 5724 redraw_later(VALID);
5725 win_enter(curwin_save, TRUE); 5725 win_enter(curwin_save, TRUE);
5726 } 5726 }
5727 # ifdef FEAT_TEXT_PROP 5727 # ifdef FEAT_PROP_POPUP
5728 else if (WIN_IS_POPUP(curwin)) 5728 else if (WIN_IS_POPUP(curwin))
5729 // can't keep focus in popup window 5729 // can't keep focus in popup window
5730 win_enter(firstwin, TRUE); 5730 win_enter(firstwin, TRUE);
5731 # endif 5731 # endif
5732 #endif 5732 #endif