Mercurial > vim

comparison src/window.c @ 17111:af861fccc309 v8.1.1555

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1555: NOT_IN_POPUP_WINDOW is confusing commit https://github.com/vim/vim/commit/8cdbd5b3c4225b04536dea7523718695306b16b5 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jun 16 15:50:45 2019 +0200 patch 8.1.1555: NOT_IN_POPUP_WINDOW is confusing Problem: NOT_IN_POPUP_WINDOW is confusing. (Andy Massimino) Solution: Rename to ERROR_IF_POPUP_WINDOW().
author Bram Moolenaar <Bram@vim.org>
date Sun, 16 Jun 2019 16:00:04 +0200
parents 221d4b82bc0b
children b439e096a011
comparison
equal deleted inserted replaced
17110:c8fde910ac10 17111:af861fccc309
85 int type = FIND_DEFINE; 85 int type = FIND_DEFINE;
86 int len; 86 int len;
87 #endif 87 #endif
88 char_u cbuf[40]; 88 char_u cbuf[40];
89 89
90 if (NOT_IN_POPUP_WINDOW) 90 if (ERROR_IF_POPUP_WINDOW)
91 return; 91 return;
92 92
93 #ifdef FEAT_CMDWIN 93 #ifdef FEAT_CMDWIN
94 # define CHECK_CMDWIN \ 94 # define CHECK_CMDWIN \
95 do { \ 95 do { \
733 * return FAIL for failure, OK otherwise 733 * return FAIL for failure, OK otherwise
734 */ 734 */
735 int 735 int
736 win_split(int size, int flags) 736 win_split(int size, int flags)
737 { 737 {
738 if (NOT_IN_POPUP_WINDOW) 738 if (ERROR_IF_POPUP_WINDOW)
739 return FAIL; 739 return FAIL;
740 740
741 /* When the ":tab" modifier was used open a new tab page instead. */ 741 /* When the ":tab" modifier was used open a new tab page instead. */
742 if (may_open_tabpage() == OK) 742 if (may_open_tabpage() == OK)
743 return OK; 743 return OK;
1521 frame_T *frp2; 1521 frame_T *frp2;
1522 win_T *wp; 1522 win_T *wp;
1523 win_T *wp2; 1523 win_T *wp2;
1524 int temp; 1524 int temp;
1525 1525
1526 if (NOT_IN_POPUP_WINDOW) 1526 if (ERROR_IF_POPUP_WINDOW)
1527 return; 1527 return;
1528 if (ONE_WINDOW) // just one window 1528 if (ONE_WINDOW) // just one window
1529 { 1529 {
1530 beep_flush(); 1530 beep_flush();
1531 return; 1531 return;
2377 int dir; 2377 int dir;
2378 int help_window = FALSE; 2378 int help_window = FALSE;
2379 tabpage_T *prev_curtab = curtab; 2379 tabpage_T *prev_curtab = curtab;
2380 frame_T *win_frame = win->w_frame->fr_parent; 2380 frame_T *win_frame = win->w_frame->fr_parent;
2381 2381
2382 if (NOT_IN_POPUP_WINDOW) 2382 if (ERROR_IF_POPUP_WINDOW)
2383 return FAIL; 2383 return FAIL;
2384 2384
2385 if (last_window()) 2385 if (last_window())
2386 { 2386 {
2387 emsg(_("E444: Cannot close last window")); 2387 emsg(_("E444: Cannot close last window"));
4238 { 4238 {
4239 #ifdef FEAT_CONCEAL 4239 #ifdef FEAT_CONCEAL
4240 win_T *owp = curwin; 4240 win_T *owp = curwin;
4241 #endif 4241 #endif
4242 4242
4243 if (NOT_IN_POPUP_WINDOW) 4243 if (ERROR_IF_POPUP_WINDOW)
4244 return; 4244 return;
4245 if (text_locked()) 4245 if (text_locked())
4246 { 4246 {
4247 beep_flush(); 4247 beep_flush();
4248 text_locked_msg(); 4248 text_locked_msg();