diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index f34891a..0d66d2b 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -952,6 +952,7 @@
 	browsedir()		put up a directory requester
 	confirm()		let the user make a choice
 	getchar()		get a character from the user
+	getcharstr()		get a character from the user as a string
 	getcharmod()		get modifiers for the last typed character
 	getmousepos()		get last known mouse position
 	echoraw()		output characters as-is
diff --git a/src/testdir/test_function_lists.vim b/src/testdir/test_function_lists.vim
index 7bf8d4d..59180e3 100644
--- a/src/testdir/test_function_lists.vim
+++ b/src/testdir/test_function_lists.vim
@@ -96,7 +96,7 @@
   sort u
   w! ++ff=unix Xfunction-list
   let l:unequal = assert_equalfile("Xsorted_current_global_functions", "Xfunction-list",
-      \ "\":help functions-list\" incomplete")
+      \ "\":help function-list\" incomplete")
   if l:unequal && executable("diff")
     call system("diff -u Xsorted_current_global_functions Xfunction-list > Xfunction-list.diff")
   endif
diff --git a/src/version.c b/src/version.c
index a1b2c23..e39ee98 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2958,
+/**/
     2957,
 /**/
     2956,