izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Give credit to deletion at end of line per Bill (fixes #10 github issue)

Browse Source
This commit is contained in:
Keith Winstein
2012-02-13 02:44:13 -05:00
parent 20f03791a3
commit c34986471c
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/terminaloverlay.cc
+4 -7
View File
@@ -94,14 +94,11 @@ Validity ConditionalOverlayCell::get_validity( const Framebuffer &fb, int row,
if ( (late_ack >= expiration_frame) if ( (late_ack >= expiration_frame)
|| ( (sent_frame <= early_ack) && (expiration_time <= now) ) ) { || ( (sent_frame <= early_ack) && (expiration_time <= now) ) ) {
/* special case deletion */ if ( (current.contents == replacement.contents)
if ( current.is_blank() && replacement.is_blank() ) { || (current.is_blank() && replacement.is_blank()) ) {
return CorrectNoCredit;
}
if ( current.contents == replacement.contents ) {
auto it = find_if( original_contents.begin(), original_contents.end(), auto it = find_if( original_contents.begin(), original_contents.end(),
[&]( const Cell &x ) { return replacement.contents == x.contents; } ); [&]( const Cell &x ) { return ( (replacement.is_blank() && x.is_blank())
|| (replacement.contents == x.contents) ); } );
if ( it == original_contents.end() ) { if ( it == original_contents.end() ) {
return Correct; return Correct;
} else { } else {