From 7ec19a5bed3d72fbb64849518129af0f030ba328 Mon Sep 17 00:00:00 2001
From: Keith Winstein <keithw@cs.stanford.edu>
Date: Mon, 24 Aug 2015 09:51:55 -0700
Subject: [PATCH] terminal.cc: Remove overly-strong assertion on Unicode
 fallback

Fixes #667
---
 src/terminal/terminal.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/terminal/terminal.cc b/src/terminal/terminal.cc
index 2dfa144..3876547 100644
--- a/src/terminal/terminal.cc
+++ b/src/terminal/terminal.cc
@@ -119,7 +119,10 @@ void Emulator::print( const Parser::Print *act )
 
     if ( combining_cell->contents.size() == 0 ) {
       /* cell starts with combining character */
-      assert( this_cell == combining_cell );
+      /* ... but isn't necessarily the target for a new
+	 base character [e.g. start of line], if the
+	 combining character has been cleared with
+	 a sequence like ED ("J") or EL ("K") */
       assert( combining_cell->width == 1 );
       combining_cell->fallback = true;
       fb.ds.move_col( 1, true, true );