summaryrefslogtreecommitdiff
path: root/data/vim/patches/8.1.0625
blob: 3a59636952247ec0f54d5fa86c7007b55f9ea4ad (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
To: vim_dev@googlegroups.com
Subject: Patch 8.1.0625
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.1.0625
Problem:    MS-Windows: terminal test fails in white console.
Solution:   Accept both white and black background colors.
Files:	    src/testdir/test_terminal.vim


*** ../vim-8.1.0624/src/testdir/test_terminal.vim	2018-12-21 20:55:18.892739645 +0100
--- src/testdir/test_terminal.vim	2018-12-22 18:23:32.821544966 +0100
***************
*** 159,168 ****
    call assert_equal('2', l[1].chars)
    call assert_equal('3', l[2].chars)
    call assert_equal('#00e000', l[0].fg)
!   if &background == 'light'
!     call assert_equal('#ffffff', l[0].bg)
    else
!     call assert_equal('#000000', l[0].bg)
    endif
  
    let l = term_getline(a:buf, -1)
--- 159,174 ----
    call assert_equal('2', l[1].chars)
    call assert_equal('3', l[2].chars)
    call assert_equal('#00e000', l[0].fg)
!   if has('win32')
!     " On Windows 'background' always defaults to dark, even though the terminal
!     " may use a light background.  Therefore accept both white and black.
!     call assert_match('#ffffff\|#000000', l[0].bg)
    else
!     if &background == 'light'
!       call assert_equal('#ffffff', l[0].bg)
!     else
!       call assert_equal('#000000', l[0].bg)
!     endif
    endif
  
    let l = term_getline(a:buf, -1)
*** ../vim-8.1.0624/src/version.c	2018-12-22 17:27:08.982517207 +0100
--- src/version.c	2018-12-22 18:24:54.488931363 +0100
***************
*** 801,802 ****
--- 801,804 ----
  {   /* Add new patch number below this line */
+ /**/
+     625,
  /**/

-- 
You have the right to remain silent. Anything you say will be
misquoted, then used against you.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///