Merge pull request #14088 from janlazo/vim-8.2.2577

vim-patch:8.1.0783,8.2.{1507,2152,2438,2577}

5 files changed, 19 insertions, 21 deletions

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 6d97310c1c..63d5216cc4 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -5280,14 +5280,10 @@ bool set_ref_in_item(typval_T *tv, int copyID, ht_stack_T **ht_stack,
         if (ht_stack == NULL) {
           abort = set_ref_in_ht(&dd->dv_hashtab, copyID, list_stack);
         } else {
-          ht_stack_T *newitem = try_malloc(sizeof(ht_stack_T));
-          if (newitem == NULL) {
-            abort = true;
-          } else {
-            newitem->ht = &dd->dv_hashtab;
-            newitem->prev = *ht_stack;
-            *ht_stack = newitem;
-          }
+          ht_stack_T *const newitem = xmalloc(sizeof(ht_stack_T));
+          newitem->ht = &dd->dv_hashtab;
+          newitem->prev = *ht_stack;
+          *ht_stack = newitem;
         }
 
         QUEUE *w = NULL;
@@ -5308,14 +5304,10 @@ bool set_ref_in_item(typval_T *tv, int copyID, ht_stack_T **ht_stack,
         if (list_stack == NULL) {
           abort = set_ref_in_list(ll, copyID, ht_stack);
         } else {
-          list_stack_T *newitem = try_malloc(sizeof(list_stack_T));
-          if (newitem == NULL) {
-            abort = true;
-          } else {
-            newitem->list = ll;
-            newitem->prev = *list_stack;
-            *list_stack = newitem;
-          }
+          list_stack_T *const newitem = xmalloc(sizeof(list_stack_T));
+          newitem->list = ll;
+          newitem->prev = *list_stack;
+          *list_stack = newitem;
         }
       }
       break;
diff --git a/src/nvim/eval/typval.h b/src/nvim/eval/typval.h
index 6fcb01aace..531b17cb59 100644
--- a/src/nvim/eval/typval.h
+++ b/src/nvim/eval/typval.h
@@ -341,8 +341,9 @@ struct ufunc {
                                  ///< used for s: variables
   int          uf_refcount;      ///< reference count, see func_name_refcount()
   funccall_T   *uf_scoped;       ///< l: local variables for closure
-  char_u       uf_name[];        ///< Name of function; can start with <SNR>123_
-                                 ///< (<SNR> is K_SPECIAL KS_EXTRA KE_SNR)
+  char_u       uf_name[];  ///< Name of function (actual size equals name);
+                           ///< can start with <SNR>123_
+                           ///< (<SNR> is K_SPECIAL KS_EXTRA KE_SNR)
 };
 
 struct partial_S {
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index 293a4d01db..34d8eb0ffe 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -3859,8 +3859,8 @@ static void ml_updatechunk(buf_T *buf, linenr_T line, long len, int updtype)
     /* May resize here so we don't have to do it in both cases below */
     if (buf->b_ml.ml_usedchunks + 1 >= buf->b_ml.ml_numchunks) {
       buf->b_ml.ml_numchunks = buf->b_ml.ml_numchunks * 3 / 2;
-      buf->b_ml.ml_chunksize = (chunksize_T *)
-                               xrealloc(buf->b_ml.ml_chunksize,
+      buf->b_ml.ml_chunksize = xrealloc(
+          buf->b_ml.ml_chunksize,
           sizeof(chunksize_T) * buf->b_ml.ml_numchunks);
     }
 
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 20e3cc0a2e..47f1cb6423 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -2656,7 +2656,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
           // already be in use.
           xfree(p_extra_free);
           p_extra_free = xmalloc(MAX_MCO * fdc + 1);
-          n_extra = fill_foldcolumn(p_extra_free, wp, foldinfo, lnum);
+          n_extra = (int)fill_foldcolumn(p_extra_free, wp, foldinfo, lnum);
           p_extra_free[n_extra] = NUL;
           p_extra = p_extra_free;
           c_extra = NUL;
diff --git a/src/nvim/testdir/test_cursor_func.vim b/src/nvim/testdir/test_cursor_func.vim
index 2e190911b2..53b7da517e 100644
--- a/src/nvim/testdir/test_cursor_func.vim
+++ b/src/nvim/testdir/test_cursor_func.vim
@@ -92,6 +92,11 @@ func Test_screenpos()
     \ 'endcol': wincol + 9}, screenpos(winid, 2, 22))
   close
   bwipe!
+
+  call assert_equal({'col': 1, 'row': 1, 'endcol': 1, 'curscol': 1}, screenpos(win_getid(), 1, 1))
+  nmenu WinBar.TEST :
+  call assert_equal({'col': 1, 'row': 2, 'endcol': 1, 'curscol': 1}, screenpos(win_getid(), 1, 1))
+  nunmenu WinBar.TEST
 endfunc
 
 func Test_screenpos_number()