vim-patch:7.4.1954

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

d388d2ac8b

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

@@ -486,7 +486,7 @@ static int included_patches[] = {
   // 1957 NA
   1956,
   // 1955 NA
-  // 1954,
+  1954,
   1953,
   1952,
   // 1951 NA