Mercurial > vim

comparison src/ex_docmd.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 bd4c34db84ab
children 8f05b3cf8557
comparison
equal deleted inserted replaced
18762:19582783e5ad 18763:49b78d6465e5
366 # define ex_terminal ex_ni 366 # define ex_terminal ex_ni
367 #endif 367 #endif
368 #if !defined(FEAT_X11) || !defined(FEAT_XCLIPBOARD) 368 #if !defined(FEAT_X11) || !defined(FEAT_XCLIPBOARD)
369 # define ex_xrestore ex_ni 369 # define ex_xrestore ex_ni
370 #endif 370 #endif
371 #if !defined(FEAT_TEXT_PROP) 371 #if !defined(FEAT_PROP_POPUP)
372 # define ex_popupclear ex_ni 372 # define ex_popupclear ex_ni
373 #endif 373 #endif
374 374
375 /* 375 /*
376 * Declare cmdnames[]. 376 * Declare cmdnames[].
5011 if (win->w_p_pvw) 5011 if (win->w_p_pvw)
5012 { 5012 {
5013 ex_win_close(eap->forceit, win, NULL); 5013 ex_win_close(eap->forceit, win, NULL);
5014 return; 5014 return;
5015 } 5015 }
5016 # ifdef FEAT_TEXT_PROP 5016 # ifdef FEAT_PROP_POPUP
5017 // Also when 'previewpopup' is empty, it might have been cleared. 5017 // Also when 'previewpopup' is empty, it might have been cleared.
5018 popup_close_preview(); 5018 popup_close_preview();
5019 # endif 5019 # endif
5020 } 5020 }
5021 #endif 5021 #endif
7810 // Return cursor to where we were 7810 // Return cursor to where we were
7811 validate_cursor(); 7811 validate_cursor();
7812 redraw_later(VALID); 7812 redraw_later(VALID);
7813 win_enter(curwin_save, TRUE); 7813 win_enter(curwin_save, TRUE);
7814 } 7814 }
7815 # ifdef FEAT_TEXT_PROP 7815 # ifdef FEAT_PROP_POPUP
7816 else if (WIN_IS_POPUP(curwin)) 7816 else if (WIN_IS_POPUP(curwin))
7817 { 7817 {
7818 // can't keep focus in popup window 7818 // can't keep focus in popup window
7819 win_enter(firstwin, TRUE); 7819 win_enter(firstwin, TRUE);
7820 } 7820 }