diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-09-12 12:24:11 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-09-12 12:24:11 +0200 |
commit | 1b010058235fb803c1d4f42a02d2883921be8ef4 (patch) | |
tree | 6cae2a8a3338cab25be5834d68ec89113bbf1764 | |
parent | 220adb1e9f9e0b27d28185167d2730bf2f93057d (diff) | |
download | vim-1b010058235fb803c1d4f42a02d2883921be8ef4.zip |
patch 7.4.2365
Problem: Needless line break. Confusing directory name.
Solution: Remove line break. Prepend "../" to "tools".
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | runtime/doc/version8.txt | 5 | ||||
-rw-r--r-- | src/normal.c | 3 | ||||
-rw-r--r-- | src/version.c | 2 |
4 files changed, 9 insertions, 3 deletions
@@ -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 2e02523b2..e7a97e03d 100644 --- 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 92ef575d2..8302ffbc9 100644 --- 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 103a26f4a..419cfbc5b 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2365, +/**/ 2364, /**/ 2363, |