diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 7c9ad3010e..a421f6b5e7 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4202,7 +4202,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	rows in the window, depending on whether 'number' or 'relativenumber'
 	is set. Thus with the Vim default of 4 there is room for a line number
 	up to 999. When the buffer has 1000 lines five columns will be used.
-	The minimum value is 1, the maximum value is 10.
+	The minimum value is 1, the maximum value is 20.
 
 						*'omnifunc'* *'ofu'*
 'omnifunc' 'ofu'	string	(default: empty)
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index fb8ec5457b..becd4eaca1 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -22025,6 +22025,7 @@ static bool script_autoload(const char *const name, const size_t name_len,
 }
 
 /// Return the autoload script name for a function or variable name
+/// Caller must make sure that "name" contains AUTOLOAD_CHAR.
 ///
 /// @param[in]  name  Variable/function name.
 /// @param[in]  name_len  Name length.
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 1f258985a6..093067894f 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -2495,7 +2495,7 @@ static void realloc_cmdbuff(int len)
 static char_u   *arshape_buf = NULL;
 
 # if defined(EXITFREE)
-void free_cmdline_buf(void)
+void free_arshape_buf(void)
 {
   xfree(arshape_buf);
 }
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index dced03f3d5..1384aa177b 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -648,7 +648,7 @@ void free_all_mem(void)
   // Free all option values.  Must come after closing windows.
   free_all_options();
 
-  free_cmdline_buf();
+  free_arshape_buf();
 
   /* Clear registers. */
   clear_registers();
diff --git a/src/nvim/option.c b/src/nvim/option.c
index e8e246c277..62f736ea31 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -4274,7 +4274,7 @@ static char *set_num_option(int opt_idx, char_u *varp, long value,
   } else if (pp == &curwin->w_p_nuw || pp == &curwin->w_allbuf_opt.wo_nuw) {
     if (value < 1) {
       errmsg = e_positive;
-    } else if (value > 10) {
+    } else if (value > 20) {
       errmsg = e_invarg;
     }
   } else if (pp == &curbuf->b_p_iminsert || pp == &p_iminsert) {
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index acff44164f..846ffeb442 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -2085,7 +2085,7 @@ win_line (
   int lcs_eol_one = wp->w_p_lcs_chars.eol;     // 'eol'  until it's been used
   int lcs_prec_todo = wp->w_p_lcs_chars.prec;  // 'prec' until it's been used
 
-  /* saved "extra" items for when draw_state becomes WL_LINE (again) */
+  // saved "extra" items for when draw_state becomes WL_LINE (again)
   int saved_n_extra = 0;
   char_u      *saved_p_extra = NULL;
   int saved_c_extra = 0;
diff --git a/src/nvim/testdir/test_diffmode.vim b/src/nvim/testdir/test_diffmode.vim
index 00f4563f3d..1ba36ca8e9 100644
--- a/src/nvim/testdir/test_diffmode.vim
+++ b/src/nvim/testdir/test_diffmode.vim
@@ -752,6 +752,9 @@ func Test_diff_of_diff()
   if !CanRunVimInTerminal()
     return
   endif
+  if !has("rightleft")
+    throw 'Skipped: rightleft not supported'
+  endif
 
   call writefile([
 	\ 'call setline(1, ["aa","bb","cc","@@ -3,2 +5,7 @@","dd","ee","ff"])',
diff --git a/src/nvim/testdir/test_options.vim b/src/nvim/testdir/test_options.vim
index 28576709a3..a6ebd7b023 100644
--- a/src/nvim/testdir/test_options.vim
+++ b/src/nvim/testdir/test_options.vim
@@ -231,7 +231,7 @@ func Test_set_errors()
   call assert_fails('set backupcopy=', 'E474:')
   call assert_fails('set regexpengine=3', 'E474:')
   call assert_fails('set history=10001', 'E474:')
-  call assert_fails('set numberwidth=11', 'E474:')
+  call assert_fails('set numberwidth=21', 'E474:')
   call assert_fails('set colorcolumn=-a')
   call assert_fails('set colorcolumn=a')
   call assert_fails('set colorcolumn=1,')
diff --git a/test/functional/options/num_options_spec.lua b/test/functional/options/num_options_spec.lua
index 88e554c86f..deda5c9118 100644
--- a/test/functional/options/num_options_spec.lua
+++ b/test/functional/options/num_options_spec.lua
@@ -74,7 +74,7 @@ describe(':set validation', function()
     should_fail('foldlevel', -5, 'E487')
     should_fail('foldcolumn', 13, 'E474')
     should_fail('conceallevel', 4, 'E474')
-    should_fail('numberwidth', 11, 'E474')
+    should_fail('numberwidth', 21, 'E474')
     should_fail('numberwidth', 0, 'E487')
 
     -- If smaller than 1 this one is set to 'lines'-1