diff --git a/src/dict.c b/src/dict.c
index 8d07644..b3ef35a 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -22,6 +22,7 @@
 
 /*
  * 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 543304f..ed2cfec 100644
--- a/src/gui_motif.c
+++ b/src/gui_motif.c
@@ -1242,7 +1242,6 @@
     }
     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 007aa9d..330bb53 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1688,7 +1688,8 @@
 #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 c7dd41f..3c6fe1c 100644
--- a/src/testdir/shared.vim
+++ b/src/testdir/shared.vim
@@ -223,7 +223,7 @@
   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 629c31a..ea845bd 100644
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -845,6 +845,7 @@
   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 cc29d0d..d1cf21b 100644
--- a/src/time.c
+++ b/src/time.c
@@ -497,10 +497,12 @@
 	    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 067377e..da188c1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1961,
+/**/
     1960,
 /**/
     1959,