patch 7.4.2365

Problem:    Needless line break. Confusing directory name.
Solution:   Remove line break.  Prepend "../" to "tools".

diff --git a/Makefile b/Makefile
index e601b6757b122882076b2068057f12b1000a7cdc..a83e7337b71044c8ff4e6c78520258de3bc70701 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -140,7 +140,7 @@ MINOR = 4
 #   > nmake -f Make_mvc.mak testclean
 #   > nmake -f Make_mvc.mak test
 #   - check the output.
-# - Rename (using tools/rename.bat):
+# - Rename (using ../tools/rename.bat):
 #           vim.exe to vimw32.exe
 #           tee/tee.exe to teew32.exe
 #           xxd/xxd.exe to xxdw32.exe

diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt
index 2e02523b2494c1445d08811bbf2a3a46bf49d4de..e7a97e03d5c98ba2717a6aa9d404389a290d6346 100644 (file)
--- a/runtime/doc/version8.txt
+++ b/runtime/doc/version8.txt
@@ -14493,4 +14493,9 @@ Problem:    Sort test sometimes fails.
 Solution:   Add it to the list of flaky tests.
 Files:      src/testdir/runtest.vim
 
+Patch 7.4.2365
+Problem:    Needless line break. Confusing directory name.
+Solution:   Remove line break.  Prepend "../" to "tools".
+Files:      Makefile, src/normal.c
+
  vim:tw=78:ts=8:ft=help:norl:

diff --git a/src/normal.c b/src/normal.c
index 92ef575d25e5ab1944856f66c837e2d52a002028..8302ffbc998033c6367671801d31f4341dad7634 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -6099,8 +6099,7 @@ nv_up(cmdarg_T *cap)
  * cap->arg is TRUE for CR and "+": Move cursor to first non-blank.
  */
     static void
-nv_down(
-    cmdarg_T   *cap)
+nv_down(cmdarg_T *cap)
 {
     if (mod_mask & MOD_MASK_SHIFT)
     {

diff --git a/src/version.c b/src/version.c
index 103a26f4ae34d784db26ff52f6b8e73493844b65..419cfbc5bbd3decce3c43b79418277ddcb0be3ba 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2365,
 /**/
     2364,
 /**/