From 3677189bfc1978b3b55f70d75d93bae54fa1f704 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Fri, 10 Feb 2017 09:29:27 -0500
Subject: vim-patch:7.4.1954

Problem:    No test for what 7.4.1948 fixes.
Solution:   Add a test. (Hirohito Higashi, closes vim/vim#880)

https://github.com/vim/vim/commit/d388d2ac8bf8c770bf97dc406e99a20ba5104855

Some adjustments had to be made from upstream since nvim always uses
utf-8 internally.

* Removed the 'set encoding=cp932' line from the test
* Adjusted the expected values for getpos(), since the number of bytes
  is different in utf-8
---
 src/nvim/version.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/version.c')

diff --git a/src/nvim/version.c b/src/nvim/version.c
index a958ff1fd9..d62ecc22cf 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -486,7 +486,7 @@ static int included_patches[] = {
   // 1957 NA
   1956,
   // 1955 NA
-  // 1954,
+  1954,
   1953,
   1952,
   // 1951 NA
-- 
cgit