Patch 8.2.3752

4 views
Skip to first unread message

Bram Moolenaar

unread,
Dec 6, 2021, 6:25:14 AM12/6/21
to vim...@googlegroups.com

Patch 8.2.3752
Problem: Build error when using Photon GUI.
Solution: Adjust #ifdef. (closes #9288)
Files: src/beval.c


*** ../vim-8.2.3751/src/beval.c 2020-06-24 19:33:59.561106332 +0100
--- src/beval.c 2021-12-06 11:21:42.371903627 +0000
***************
*** 150,167 ****
int row = mouse_row;
int col = mouse_col;

! # ifdef FEAT_GUI
if (gui.in_use)
{
row = Y_2_ROW(beval->y);
col = X_2_COL(beval->x);
}
! #endif
if (find_word_under_cursor(row, col, getword,
FIND_IDENT + FIND_STRING + FIND_EVAL,
winp, lnump, textp, colp, NULL) == OK)
{
! #ifdef FEAT_VARTABS
vim_free(beval->vts);
beval->vts = tabstop_copy((*winp)->w_buffer->b_p_vts_array);
if ((*winp)->w_buffer->b_p_vts_array != NULL && beval->vts == NULL)
--- 150,167 ----
int row = mouse_row;
int col = mouse_col;

! # ifdef FEAT_BEVAL_GUI
if (gui.in_use)
{
row = Y_2_ROW(beval->y);
col = X_2_COL(beval->x);
}
! # endif
if (find_word_under_cursor(row, col, getword,
FIND_IDENT + FIND_STRING + FIND_EVAL,
winp, lnump, textp, colp, NULL) == OK)
{
! # ifdef FEAT_VARTABS
vim_free(beval->vts);
beval->vts = tabstop_copy((*winp)->w_buffer->b_p_vts_array);
if ((*winp)->w_buffer->b_p_vts_array != NULL && beval->vts == NULL)
***************
*** 170,176 ****
vim_free(*textp);
return FAIL;
}
! #endif
beval->ts = (*winp)->w_buffer->b_p_ts;
return OK;
}
--- 170,176 ----
vim_free(*textp);
return FAIL;
}
! # endif
beval->ts = (*winp)->w_buffer->b_p_ts;
return OK;
}
*** ../vim-8.2.3751/src/version.c 2021-12-06 11:03:50.954900203 +0000
--- src/version.c 2021-12-06 11:23:21.328149293 +0000
***************
*** 755,756 ****
--- 755,758 ----
{ /* Add new patch number below this line */
+ /**/
+ 3752,
/**/

--
I think that you'll agree that engineers are very effective in their social
interactions. It's the "normal" people who are nuts.
(Scott Adams - The Dilbert principle)

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages