From b46746b93ef298688cba3d8fbbcdae13e069935c Mon Sep 17 00:00:00 2001
From: Felipe Morales <hel.sheep@gmail.com>
Date: Sat, 31 Jan 2015 20:19:53 -0300
Subject: 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
---
 src/nvim/testdir/test_command_count.in | 1 +
 src/nvim/version.c                     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

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,
-- 
cgit