summaryrefslogtreecommitdiff
path: root/data/vim/patches/8.1.0322
blob: 3bed5bf49696412f07ab1ac165206d671c42b0ff (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
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
To: vim_dev@googlegroups.com
Subject: Patch 8.1.0322
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.0322
Problem:    Test_copy_winopt() does not restore 'hidden'.
Solution:   Restore the option, fix indent. (Ozaki Kiichi, closes #3367)
Files:	    src/testdir/test_options.vim


*** ../vim-8.1.0321/src/testdir/test_options.vim	2018-08-21 18:50:11.153501902 +0200
--- src/testdir/test_options.vim	2018-08-23 22:17:40.635048688 +0200
***************
*** 350,404 ****
  endfunc
  
  func Test_copy_winopt()
!     set hidden
  
!     " Test copy option from current buffer in window
!     split
!     enew
!     setlocal numberwidth=5
!     wincmd w
!     call assert_equal(4,&numberwidth)
!     bnext
!     call assert_equal(5,&numberwidth)
!     bw!
!     call assert_equal(4,&numberwidth)
! 
!     " Test copy value from window that used to be display the buffer
!     split
!     enew
!     setlocal numberwidth=6
!     bnext
!     wincmd w
!     call assert_equal(4,&numberwidth)
!     bnext
!     call assert_equal(6,&numberwidth)
!     bw!
! 
!     " Test that if buffer is current, don't use the stale cached value
!     " from the last time the buffer was displayed.
!     split
!     enew
!     setlocal numberwidth=7
!     bnext
!     bnext
!     setlocal numberwidth=8
!     wincmd w
!     call assert_equal(4,&numberwidth)
!     bnext
!     call assert_equal(8,&numberwidth)
!     bw!
! 
!     " Test value is not copied if window already has seen the buffer
!     enew
!     split
!     setlocal numberwidth=9
!     bnext
!     setlocal numberwidth=10
!     wincmd w
!     call assert_equal(4,&numberwidth)
!     bnext
!     call assert_equal(4,&numberwidth)
!     bw!
  endfunc
  
  func Test_shortmess_F()
--- 350,406 ----
  endfunc
  
  func Test_copy_winopt()
!   set hidden
  
!   " Test copy option from current buffer in window
!   split
!   enew
!   setlocal numberwidth=5
!   wincmd w
!   call assert_equal(4,&numberwidth)
!   bnext
!   call assert_equal(5,&numberwidth)
!   bw!
!   call assert_equal(4,&numberwidth)
! 
!   " Test copy value from window that used to be display the buffer
!   split
!   enew
!   setlocal numberwidth=6
!   bnext
!   wincmd w
!   call assert_equal(4,&numberwidth)
!   bnext
!   call assert_equal(6,&numberwidth)
!   bw!
! 
!   " Test that if buffer is current, don't use the stale cached value
!   " from the last time the buffer was displayed.
!   split
!   enew
!   setlocal numberwidth=7
!   bnext
!   bnext
!   setlocal numberwidth=8
!   wincmd w
!   call assert_equal(4,&numberwidth)
!   bnext
!   call assert_equal(8,&numberwidth)
!   bw!
! 
!   " Test value is not copied if window already has seen the buffer
!   enew
!   split
!   setlocal numberwidth=9
!   bnext
!   setlocal numberwidth=10
!   wincmd w
!   call assert_equal(4,&numberwidth)
!   bnext
!   call assert_equal(4,&numberwidth)
!   bw!
! 
!   set hidden&
  endfunc
  
  func Test_shortmess_F()
*** ../vim-8.1.0321/src/version.c	2018-08-23 20:55:23.328137497 +0200
--- src/version.c	2018-08-23 22:19:27.038296744 +0200
***************
*** 796,797 ****
--- 796,799 ----
  {   /* Add new patch number below this line */
+ /**/
+     322,
  /**/

-- 
BEDEVERE:        Why do you think she is a witch?
SECOND VILLAGER: She turned me into a newt.
BEDEVERE:        A newt?
SECOND VILLAGER: (After looking at himself for some time) I got better.
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// 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    ///