Mercurial > vim

comparison src/popupwin.c @ 16813:4cfad94161f4 v8.1.1408

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1408: PFL_HIDDEN conflicts with system header file commit https://github.com/vim/vim/commit/bf0ecb2cb63fb710198d6be742ae4f00fdd2f948 Author: Bram Moolenaar <Bram@vim.org> Date: Mon May 27 10:04:40 2019 +0200 patch 8.1.1408: PFL_HIDDEN conflicts with system header file Problem: PFL_HIDDEN conflicts with system header file. Solution: Rename to POPF_HIDDEN.
author Bram Moolenaar <Bram@vim.org>
date Mon, 27 May 2019 10:15:05 +0200
parents 0457d49eb2d9
children 069ee8dc8c8d
comparison
equal deleted inserted replaced
16812:55ca009f1493 16813:4cfad94161f4
298 popup_any_visible(void) 298 popup_any_visible(void)
299 { 299 {
300 win_T *wp; 300 win_T *wp;
301 301
302 for (wp = first_popupwin; wp != NULL; wp = wp->w_next) 302 for (wp = first_popupwin; wp != NULL; wp = wp->w_next)
303 if ((wp->w_popup_flags & PFL_HIDDEN) == 0) 303 if ((wp->w_popup_flags & POPF_HIDDEN) == 0)
304 return TRUE; 304 return TRUE;
305 for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next) 305 for (wp = curtab->tp_first_popupwin; wp != NULL; wp = wp->w_next)
306 if ((wp->w_popup_flags & PFL_HIDDEN) == 0) 306 if ((wp->w_popup_flags & POPF_HIDDEN) == 0)
307 return TRUE; 307 return TRUE;
308 return FALSE; 308 return FALSE;
309 } 309 }
310 310
311 /* 311 /*
326 f_popup_hide(typval_T *argvars, typval_T *rettv UNUSED) 326 f_popup_hide(typval_T *argvars, typval_T *rettv UNUSED)
327 { 327 {
328 int id = (int)tv_get_number(argvars); 328 int id = (int)tv_get_number(argvars);
329 win_T *wp = find_popup_win(id); 329 win_T *wp = find_popup_win(id);
330 330
331 if (wp != NULL && (wp->w_popup_flags & PFL_HIDDEN) == 0) 331 if (wp != NULL && (wp->w_popup_flags & POPF_HIDDEN) == 0)
332 { 332 {
333 wp->w_popup_flags |= PFL_HIDDEN; 333 wp->w_popup_flags |= POPF_HIDDEN;
334 redraw_all_later(NOT_VALID); 334 redraw_all_later(NOT_VALID);
335 } 335 }
336 } 336 }
337 337
338 /* 338 /*
342 f_popup_show(typval_T *argvars, typval_T *rettv UNUSED) 342 f_popup_show(typval_T *argvars, typval_T *rettv UNUSED)
343 { 343 {
344 int id = (int)tv_get_number(argvars); 344 int id = (int)tv_get_number(argvars);
345 win_T *wp = find_popup_win(id); 345 win_T *wp = find_popup_win(id);
346 346
347 if (wp != NULL && (wp->w_popup_flags & PFL_HIDDEN) != 0) 347 if (wp != NULL && (wp->w_popup_flags & POPF_HIDDEN) != 0)
348 { 348 {
349 wp->w_popup_flags &= ~PFL_HIDDEN; 349 wp->w_popup_flags &= ~POPF_HIDDEN;
350 redraw_all_later(NOT_VALID); 350 redraw_all_later(NOT_VALID);
351 } 351 }
352 } 352 }
353 353
354 static void 354 static void