summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-07-08 20:08:44 +0200
committerBram Moolenaar <Bram@vim.org>2019-07-08 20:08:44 +0200
commitee9e604124682b0cd89e4f987a2f6f3fe4160920 (patch)
tree3d8c96fff9cedd548bf9e773050836457fe4ab99
parent3e35d05b1f99419be27ea5be70c7d0610202c163 (diff)
patch 8.1.1650: warning for using uninitialized variablev8.1.1650
Problem: Warning for using uninitialized variable. (Tony Mechelynck) Solution: Simplify the code by always using the mouse coordinates.
-rw-r--r--src/beval.c24
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 16 deletions
diff --git a/src/beval.c b/src/beval.c
index 010e201051..68df2be9ea 100644
--- a/src/beval.c
+++ b/src/beval.c
@@ -131,24 +131,16 @@ find_word_under_cursor(
*/
int
get_beval_info(
- BalloonEval *beval,
- int getword,
- win_T **winp,
- linenr_T *lnump,
- char_u **textp,
- int *colp)
+ BalloonEval *beval,
+ int getword,
+ win_T **winp,
+ linenr_T *lnump,
+ char_u **textp,
+ int *colp)
{
- int row, col;
+ int row = mouse_row;
+ int col = mouse_col;
-# ifdef FEAT_BEVAL_TERM
-# ifdef FEAT_GUI
- if (!gui.in_use)
-# endif
- {
- row = mouse_row;
- col = mouse_col;
- }
-# endif
# ifdef FEAT_GUI
if (gui.in_use)
{
diff --git a/src/version.c b/src/version.c
index 82f90932ca..6ad48828b7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1650,
+/**/
1649,
/**/
1648,