# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1469046608 -7200
# Node ID d9d3ef70c8593627102ef39053796f0b63a65347
# Parent  d1f933ea9f526470f063977c13ebe698987bb19f
commit https://github.com/vim/vim/commit/60084333816c585d5858bc085b2942f813102ae3
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Jul 20 22:23:49 2016 +0200

    patch 7.4.2084
    Problem:    New digraph test makes testing hang.
    Solution:   Don't set "nocp".

diff --git a/src/testdir/test_digraph.vim b/src/testdir/test_digraph.vim
--- a/src/testdir/test_digraph.vim
+++ b/src/testdir/test_digraph.vim
@@ -4,6 +4,8 @@ if !has("digraphs") || !has("multi_byte"
   finish
 endif
 
+scriptencoding utf-8
+
 func! Put_Dig(chars)
   exe "norm! o\<c-k>".a:chars
 endfu
@@ -13,8 +15,8 @@ func! Put_Dig_BS(char1, char2)
 endfu
 
 func! Test_digraphs()
-  let _enc=&enc
-  set nocp enc=utf8
+  let _enc = &enc
+  set enc=utf8
   new
   call Put_Dig("00")
   call assert_equal("∞", getline('.'))
@@ -214,7 +216,7 @@ func! Test_digraphs()
   call Put_Dig("el")
   call assert_equal(['␀', 'ü', '∞', 'l'], getline(line('.')-3,line('.')))
   " reset encoding option
-  let &enc=_enc
+  let &enc = _enc
   bw!
 endfunc
 
@@ -222,7 +224,7 @@ func! Test_digraphs_option()
   let _enc=&enc
   " reset whichwrap option, so that testing <esc><bs>A works,
   " without moving up a line
-  set nocp enc=utf8 digraph ww=
+  set enc=utf8 digraph ww=
   new
   call Put_Dig_BS("0","0")
   call assert_equal("∞", getline('.'))
@@ -422,7 +424,7 @@ func! Test_digraphs_option()
   call Put_Dig_BS("e","l")
   call assert_equal(['␀', 'ü', '∞', 'l'], getline(line('.')-3,line('.')))
   " reset encoding option
-  let &enc=_enc
+  let &enc = _enc
   set nodigraph ww&vim
   bw!
 endfunc
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2084,
+/**/
     2083,
 /**/
     2082,