mirror of
				https://github.com/neovim/neovim.git
				synced 2025-11-04 01:34:25 +00:00 
			
		
		
		
	vim-patch:8.2.3936: no proper test for maintaining change mark in diff mode
Problem:    No proper test for maintaining change mark in diff mode.
Solution:   Run the test with internal and external diff. (Sean Dewar,
            closes vim/vim#9424)
ccc1644f95
			
			
This commit is contained in:
		@@ -1147,6 +1147,7 @@ func Test_diff_followwrap()
 | 
				
			|||||||
endfunc
 | 
					endfunc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func Test_diff_maintains_change_mark()
 | 
					func Test_diff_maintains_change_mark()
 | 
				
			||||||
 | 
					  func DiffMaintainsChangeMark()
 | 
				
			||||||
    enew!
 | 
					    enew!
 | 
				
			||||||
    call setline(1, ['a', 'b', 'c', 'd'])
 | 
					    call setline(1, ['a', 'b', 'c', 'd'])
 | 
				
			||||||
    diffthis
 | 
					    diffthis
 | 
				
			||||||
@@ -1163,6 +1164,13 @@ func Test_diff_maintains_change_mark()
 | 
				
			|||||||
    call assert_equal([2, 3], [line("'["), line("']")])
 | 
					    call assert_equal([2, 3], [line("'["), line("']")])
 | 
				
			||||||
    bwipe!
 | 
					    bwipe!
 | 
				
			||||||
    bwipe!
 | 
					    bwipe!
 | 
				
			||||||
 | 
					  endfunc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  set diffopt-=internal
 | 
				
			||||||
 | 
					  call DiffMaintainsChangeMark()
 | 
				
			||||||
 | 
					  set diffopt+=internal
 | 
				
			||||||
 | 
					  call DiffMaintainsChangeMark()
 | 
				
			||||||
 | 
					  set diffopt&
 | 
				
			||||||
endfunc
 | 
					endfunc
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func Test_diff_rnu()
 | 
					func Test_diff_rnu()
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user