diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 01b21aa085..cd789e6466 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -215,6 +215,8 @@ BufAdd				Just after creating a new buffer which is
 				added to the buffer list, or adding a buffer
 				to the buffer list, a buffer in the buffer
 				list was renamed.
+				Not triggered for the initial buffers created
+				during startup.
 				Before |BufEnter|.
 				NOTE: Current buffer "%" may be different from
 				the buffer being created "<afile>".
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index d3647246fa..6d2f0ea654 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -518,7 +518,8 @@ accordingly.  Vim proceeds in this order:
 	displayed yet).
 	When switching screens, it happens now.  Redrawing starts.
 	If the "-q" flag was given to Vim, the first error is jumped to.
-	Buffers for all windows will be loaded.
+	Buffers for all windows will be loaded, without triggering |BufAdd|
+	autocommands.
 
 14. Execute startup commands
 	If a "-t" flag was given to Vim, the tag is jumped to.
diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
index 1f5e6682e7..907138c60b 100644
--- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
+++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim
@@ -2,7 +2,7 @@
 "
 " Author: Bram Moolenaar
 " Copyright: Vim license applies, see ":help license"
-" Last Update: 2018 Jun 3
+" Last Change: 2019 Dec 11
 "
 " WORK IN PROGRESS - Only the basics work
 " Note: On MS-Windows you need a recent version of gdb.  The one included with
@@ -726,7 +726,7 @@ func s:GotoProgram()
       call system(printf('powershell -Command "add-type -AssemblyName microsoft.VisualBasic;[Microsoft.VisualBasic.Interaction]::AppActivate(%d);"', s:pid))
     endif
   else
-    win_gotoid(s:ptywin)
+    call win_gotoid(s:ptywin)
   endif
 endfunc