patch 8.2.1961: various comments can be improved

Problem:    Various comments can be improved.
Solution:   Various comment adjustments.

diff --git a/src/dict.c b/src/dict.c
index 8d076441b1e3d39405429d163c8fd193c1a2cfcf..b3ef35a8022c0c4355895c1b29de8258e030b968 100644 (file)
--- 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 543304fe43403a953eb5d102b4bdc8c5ae13ab3a..ed2cfec67c4ec6570ccdcafc184281d41a647806 100644 (file)
--- 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 007aa9d27fc0cd6935ebe513ac2bef1a33f356fb..330bb53fa03c787a0cca44440677f9d66282972a 100644 (file)
--- 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 c7dd41f20f5a6116131e20c5a43c876abc19b35b..3c6fe1cd36c77f0373b26032231d4b0ec7c17160 100644 (file)
--- 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 629c31af9e983bf610f88b13bf514e977a0619cc..ea845bd674921f92b88c129d237aeed2696b474f 100644 (file)
--- 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 cc29d0d3980c95c4363d260649dd4d46558dcd55..d1cf21b6bc5183d2a4659169cc9362d9dec9a76f 100644 (file)
--- 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 067377ee3eb50dc5bbc4d03668fba4cb00e15274..da188c14af6d98d3f0eaf41fc6a404ccda71a877 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1961,
 /**/
     1960,
 /**/