Merge pull request #5654 from brcolow/vim-7.4.1923

vim-patch:7.4.1923
2025-02-25 18:55:25 -06:00 · 2016-11-23 21:27:20 -05:00 · 2016-11-23 21:27:20 -05:00 · cbf2a86c1d
commit cbf2a86c1d
parent 2c154216a4 4f8964cc00
3 changed files with 2 additions and 2 deletions
--- a/src/nvim/testdir/Makefile
+++ b/src/nvim/testdir/Makefile
@ -32,6 +32,7 @@ SCRIPTS := \
 # Keep test_alot*.res as the last one, sort the others.
 NEW_TESTS = \
 	    test_cscope.res \
+		test_cmdline.res \
 	    test_hardcopy.res \
 	    test_help_tagjump.res \
 	    test_history.res \
--- a/src/nvim/testdir/test_alot.vim
+++ b/src/nvim/testdir/test_alot.vim
@ -8,7 +8,6 @@ source test_ex_undo.vim
 source test_expr.vim
 source test_expr_utf8.vim
 source test_feedkeys.vim
-source test_cmdline.vim
 source test_menu.vim
 source test_options.vim
 source test_popup.vim
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@ -519,7 +519,7 @@ static int included_patches[] = {
  // 1926 NA
  // 1925 NA
  // 1924 NA
-  // 1923,
+  1923,
  // 1922 NA
  // 1921 NA
  // 1920 NA