sources/LineBuffer.m

@@ -31,6 +31,7 @@
 #import "BackgroundThread.h"
 #import "DebugLogging.h"
+#import "iTermAdvancedSettingsModel.h"
 #import "LineBlock.h"
 #import "RegexKitLite.h"
@@ -443,6 +444,7 @@ static int RawNumLines(LineBuffer* buffer, int width) {
         int length;
         int eol;
         screen_char_t continuation;
+        const int requestedLine = line;
         screen_char_t* p = [block getWrappedLineWithWrapWidth:width
                                                       lineNum:&line
                                                    lineLength:&length
@@ -455,6 +457,15 @@ static int RawNumLines(LineBuffer* buffer, int width) {
             NSAssert(length <= width, @"Length too long");
             memcpy((char*) buffer, (char*) p, length * sizeof(screen_char_t));
             [self extendContinuation:continuation inBuffer:buffer ofLength:length toWidth:width];
+
+            if (requestedLine == 0 && [iTermAdvancedSettingsModel showBlockBoundaries]) {
+                for (int i = 0; i < width; i++) {
+                    buffer[i].code = 'X';
+                    buffer[i].complexChar = NO;
+                    buffer[i].image = NO;
+                    buffer[i].urlCode = 0;
+                }
+            }
             return eol;
         }
     }

sources/iTermAdvancedSettingsModel.h

@@ -198,5 +198,6 @@
 + (BOOL)disableCustomBoxDrawing;
 + (BOOL)useExperimentalFontMetrics;
 + (BOOL)supportREPCode;
++ (BOOL)showBlockBoundaries;
 @end

sources/iTermAdvancedSettingsModel.m

@@ -292,4 +292,7 @@ DEFINE_BOOL(supportREPCode, YES, @"Experimental Features: Enable support for REP
 #else
 DEFINE_BOOL(supportREPCode, NO, @"Experimental Features: Enable support for REP (Repeat previous character) escape sequence?");
 #endif
+
+DEFINE_BOOL(showBlockBoundaries, NO, @"Debugging: Show line buffer block boundaries (issue 6207)");
+
 @end

sources/iTermInitialDirectory.h

@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
-#import "Profile.h"
+#import "ProfileModel.h"
 #import "ITAddressBookMgr.h"
 typedef NS_ENUM(NSUInteger, iTermInitialDirectoryMode) {

sources/iTermTextDrawingHelper.m

@@ -1739,7 +1739,7 @@ static BOOL iTermTextDrawingHelperIsCharacterDrawable(screen_char_t *c,
     if (![previousImageAttributes[iTermImageLineAttribute] isEqual:imageAttributes[iTermImageLineAttribute]]) {
         return NO;
     }
-    if ([previousImageAttributes[iTermImageColumnAttribute] integerValue] + 1 != [imageAttributes[iTermImageColumnAttribute] integerValue]) {
+    if ((([previousImageAttributes[iTermImageColumnAttribute] integerValue] + 1) & 0xff) != ([imageAttributes[iTermImageColumnAttribute] integerValue] & 0xff)) {
         return NO;
     }
     

version.txt

-3.1.5.beta.2
+3.1.%(extra)s