From 0522962f1529109ee021949ee105ab03ae934bc5 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Thu, 5 Nov 2020 20:47:46 -0500
Subject: vim-patch:8.2.1959: crash when terminal buffer name is made empty

Problem:    Crash when terminal buffer name is made empty. (Dhiraj Mishra)
Solution:   Fall back to "[No Name]". (closes vim/vim#7262)
https://github.com/vim/vim/commit/00806bceb6dc9c8dcd308e5f7e50f720f7dc71b0

N/A patches for version.c:

vim-patch:8.1.2422: "make depend" does not work correctly for libvterm

Problem:    "make depend" does not work correctly for libvterm.
Solution:   Fix build dependencies. And a few minor improvements.
https://github.com/vim/vim/commit/9810cfbe554b166cb05b51119040bb4426c17bac

vim-patch:8.2.1962: netbeans may access freed memory

Problem:    Netbeans may access freed memory.
Solution:   Check the buffer pointer is still valid.  Add a test. (Yegappan
            Lakshmanan, closes vim/vim#7248)
https://github.com/vim/vim/commit/32e5ec0b017adb68fe36adb9a9a362abdaffe7f4

vim-patch:8.2.1963: crash when using a popup window with "latin1" encoding

Problem:    Crash when using a popup window with "latin1" encoding.
Solution:   Don't use ScreenLinesUC when enc_utf8 is false. (closes vim/vim#7241)
https://github.com/vim/vim/commit/927495b1fef835a8f83c089bb3aa3608b617e972
---
 src/nvim/buffer.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 7ea5a64a96..0ebe33f2f8 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -5416,7 +5416,7 @@ char_u *buf_spname(buf_T *buf)
     return (char_u *)_("[Scratch]");
   }
   if (buf->b_fname == NULL) {
-    return (char_u *)_("[No Name]");
+    return buf_get_fname(buf);
   }
   return NULL;
 }
@@ -5477,6 +5477,16 @@ int buf_signcols(buf_T *buf)
     return buf->b_signcols;
 }
 
+// Get "buf->b_fname", use "[No Name]" if it is NULL.
+char_u *buf_get_fname(const buf_T *buf)
+  FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
+{
+  if (buf->b_fname == NULL) {
+    return (char_u *)_("[No Name]");
+  }
+  return buf->b_fname;
+}
+
 /*
  * Set 'buflisted' for curbuf to "on" and trigger autocommands if it changed.
  */
-- 
cgit 


From 038e98fd7de10f5442a11eb5d54c39d145559d79 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Thu, 5 Nov 2020 21:29:02 -0500
Subject: vim-patch:8.2.1961: various comments can be improved

Problem:    Various comments can be improved.
Solution:   Various comment adjustments.
https://github.com/vim/vim/commit/22286895fce0e45e42126c7f2e35ebf43bc625d9
---
 src/nvim/eval/typval.c      | 3 ++-
 src/nvim/eval/typval.h      | 3 ++-
 src/nvim/testdir/shared.vim | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index 8dde78de3d..ada6f78f10 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -1358,7 +1358,8 @@ void tv_dict_item_remove(dict_T *const dict, dictitem_T *const item)
 
 //{{{2 Alloc/free
 
-/// Allocate an empty dictionary
+/// Allocate an empty dictionary.
+/// Caller should take care of the reference count.
 ///
 /// @return [allocated] new dictionary.
 dict_T *tv_dict_alloc(void)
diff --git a/src/nvim/eval/typval.h b/src/nvim/eval/typval.h
index 503a32a81e..1e3e9bd366 100644
--- a/src/nvim/eval/typval.h
+++ b/src/nvim/eval/typval.h
@@ -301,7 +301,8 @@ struct funccall_S {
   int dbg_tick;  ///< Debug_tick when breakpoint was set.
   int level;  ///< Top nesting level of executed function.
   proftime_T prof_child;  ///< Time spent in a child.
-  funccall_T *caller;  ///< Calling function or NULL.
+  funccall_T *caller;  ///< Calling function or NULL; or next funccal in
+                       ///< list pointed to by previous_funccal.
   int fc_refcount;  ///< Number of user functions that reference this funccall.
   int fc_copyID;  ///< CopyID used for garbage collection.
   garray_T fc_funcs;  ///< List of ufunc_T* which keep a reference to "func".
diff --git a/src/nvim/testdir/shared.vim b/src/nvim/testdir/shared.vim
index 440da67412..0e20ac1593 100644
--- a/src/nvim/testdir/shared.vim
+++ b/src/nvim/testdir/shared.vim
@@ -243,7 +243,7 @@ func s:feedkeys(timer)
   call feedkeys('x', 'nt')
 endfunc
 
-" Get $VIMPROG to run Vim executable.
+" Get $VIMPROG to run the Vim executable.
 " The Makefile writes it as the first line in the "vimcmd" file.
 " Nvim: uses $NVIM_TEST_ARG0.
 func GetVimProg()
-- 
cgit