aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFelipe Morales <hel.sheep@gmail.com>2015-01-31 20:19:53 -0300
committerFelipe Morales <hel.sheep@gmail.com>2015-04-28 23:08:32 -0300
commitb46746b93ef298688cba3d8fbbcdae13e069935c (patch)
tree7f28a768d2c88e646f1bc4e1b9e5b1ea604cce21 /src
parent0c44d0ebfc1ffc6eb07c914acc2e4f432b96ce68 (diff)
downloadrneovim-b46746b93ef298688cba3d8fbbcdae13e069935c.tar.gz
rneovim-b46746b93ef298688cba3d8fbbcdae13e069935c.tar.bz2
rneovim-b46746b93ef298688cba3d8fbbcdae13e069935c.zip
vim-patch:7.4.595
Problem: The test_command_count test fails when using Japanese. Solution: Force the language to C. (Hirohito Higashi) https://code.google.com/p/vim/source/detail?name=v7-4-595
Diffstat (limited to 'src')
-rw-r--r--src/nvim/testdir/test_command_count.in1
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_command_count.in b/src/nvim/testdir/test_command_count.in
index 284110a4ec..dd3c108360 100644
--- a/src/nvim/testdir/test_command_count.in
+++ b/src/nvim/testdir/test_command_count.in
@@ -2,6 +2,7 @@ Test for user command counts vim: set ft=vim :
STARTTEST
:so tiny.vim
+:lang C
:let g:lines = []
:com -range=% RangeLines :call add(g:lines, 'RangeLines '.<line1>.' '.<line2>)
:com -range -addr=arguments RangeArguments :call add(g:lines, 'RangeArguments '.<line1>.' '.<line2>)
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 55ddcc74f1..3ca0b254f4 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -184,7 +184,7 @@ static int included_patches[] = {
//598,
//597,
//596,
- //595,
+ 595,
//594,
//593,
//592,