Merge branch 'coredata2' of https://github.com/gnachman/iTerm2 into coredata2

sources/ProfilesColorsPreferencesViewController.m

@@ -146,6 +146,16 @@ static NSString * const kColorGalleryURL = @"https://www.iterm2.com/colorgallery
         colorWell.action = @selector(settingChanged:);
         colorWell.target = self;
         colorWell.continuous = YES;
+        colorWell.willClosePopover = ^() {
+            // NSSearchField remembers who was first responder before it gained
+            // first responder status. That is the popover at this time. When
+            // the app becomes inactive, the search field makes the previous
+            // first responder the new first responder. The search field is not
+            // smart and doesn't realize the popover has been deallocated. So
+            // this changes its conception of who was the previous first
+            // responder and prevents the crash.
+            [self.view.window makeFirstResponder:nil];
+        };
     }
     PreferenceInfo *info;

sources/iTermApplicationDelegate.m

@@ -981,6 +981,7 @@ static BOOL hasBecomeActive = NO;
     return ([aMenu autorelease]);
 }
+
 - (void)applicationWillBecomeActive:(NSNotification *)aNotification
 {
     DLog(@"******** Become Active");

sources/iTermTextDrawingHelper.m

@@ -1804,7 +1804,13 @@ extern int CGContextGetFontSmoothingStyle(CGContextRef);
     CRunStorage *storage = [CRunStorage cRunStorageWithCapacity:1];
     // Draw the characters.
-    CRun *run = [self constructTextRuns:&screenChar
+    screen_char_t temp[2];
+    temp[0] = screenChar;
+    memset(temp + 1, 0, sizeof(temp[1]));
+    if (doubleWidth) {
+        temp[1].code = DWC_RIGHT;
+    }
+    CRun *run = [self constructTextRuns:temp
                                     row:row
                                selected:NO
                              indexRange:NSMakeRange(0, 1)