summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-11-05 20:50:51 +0100
committerBram Moolenaar <Bram@vim.org>2020-11-05 20:50:51 +0100
commit22286895fce0e45e42126c7f2e35ebf43bc625d9 (patch)
tree724167479bb64dc64279cc35319a533a82e704c1
parent0fd797eacd569a0680a86452c18713eacf6608fe (diff)
patch 8.2.1961: various comments can be improvedv8.2.1961
Problem: Various comments can be improved. Solution: Various comment adjustments.
-rw-r--r--src/dict.c1
-rw-r--r--src/gui_motif.c1
-rw-r--r--src/structs.h3
-rw-r--r--src/testdir/shared.vim2
-rw-r--r--src/testdir/test_netbeans.vim1
-rw-r--r--src/time.c2
-rw-r--r--src/version.c2
7 files changed, 9 insertions, 3 deletions
diff --git a/src/dict.c b/src/dict.c
index 8d076441b1..b3ef35a802 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -22,6 +22,7 @@ static dict_T *first_dict = NULL;
/*
* Allocate an empty header for a dictionary.
+ * Caller should take care of the reference count.
*/
dict_T *
dict_alloc(void)
diff --git a/src/gui_motif.c b/src/gui_motif.c
index 543304fe43..ed2cfec67c 100644
--- a/src/gui_motif.c
+++ b/src/gui_motif.c
@@ -1242,7 +1242,6 @@ add_pixmap_args(vimmenu_T *menu, Arg *args, int n)
}
else
{
- // Test_colorscheme()
if (menu->xpm_fname != NULL)
{
XtSetArg(args[n], XmNpixmapFile, menu->xpm_fname); n++;
diff --git a/src/structs.h b/src/structs.h
index 007aa9d27f..330bb53fa0 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1688,7 +1688,8 @@ struct funccall_S
#ifdef FEAT_PROFILE
proftime_T prof_child; // time spent in a child
#endif
- funccall_T *caller; // calling function or NULL
+ funccall_T *caller; // calling function or NULL; or next funccal in
+ // list pointed to by previous_funccal.
// for closure
int fc_refcount; // number of user functions that reference this
diff --git a/src/testdir/shared.vim b/src/testdir/shared.vim
index c7dd41f20f..3c6fe1cd36 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -223,7 +223,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.
func GetVimProg()
if !filereadable('vimcmd')
diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index 629c31af9e..ea845bd674 100644
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -845,6 +845,7 @@ func Nb_quit_with_conn(port)
call writefile([], "Xnetbeans")
let after =<< trim END
source shared.vim
+ set cpo&vim
func ReadXnetbeans()
let l = readfile("Xnetbeans")
diff --git a/src/time.c b/src/time.c
index cc29d0d398..d1cf21b6bc 100644
--- a/src/time.c
+++ b/src/time.c
@@ -497,10 +497,12 @@ check_due_timer(void)
may_garbage_collect = FALSE;
save_vimvars(&vvsave);
+ // Invoke the callback.
timer->tr_firing = TRUE;
timer_callback(timer);
timer->tr_firing = FALSE;
+ // Restore stuff.
timer_next = timer->tr_next;
did_one = TRUE;
timer_busy = save_timer_busy;
diff --git a/src/version.c b/src/version.c
index 067377ee3e..da188c14af 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1961,
+/**/
1960,
/**/
1959,