--- rxvt-unicode/src/screen.C	2008/11/04 13:30:41	1.312
+++ rxvt-unicode/src/screen.C	2008/11/04 14:38:29	1.315
@@ -134,6 +134,25 @@
   l.f = 0;
 }
 
+// nuke a single wide character at the given column
+void
+rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
+{
+  // find begin
+  while (col > 0 && l.t[col] == NOCHAR)
+    col--;
+
+  rend_t rend = l.r[col] & ~RS_baseattrMask;
+  rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
+
+  // found begin, nuke
+  do {
+    l.t[col] = ' ';
+    l.r[col] = rend;
+    col++;
+  } while (col < ncol && l.t[col] == NOCHAR);
+}
+
 /* ------------------------------------------------------------------------- *
  *                          SCREEN INITIALISATION                            *
  * ------------------------------------------------------------------------- */
@@ -882,22 +901,7 @@
                 || (screen.cur.col < ncol - 1
                     && line->t[screen.cur.col + 1] == NOCHAR)
              ))
-            {
-              int col = screen.cur.col;
-
-              // find begin
-              while (col > 0 && line->t[col] == NOCHAR)
-                col--;
-
-              rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' '));
-
-              // found begin, nuke
-              do {
-                line->t[col] = ' ';
-                line->r[col] = rend;
-                col++;
-              } while (col < ncol && line->t[col] == NOCHAR);
-            }
+            scr_kill_char (*line, screen.cur.col);
 
           rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
 
@@ -1444,9 +1448,6 @@
 void
 rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
 {
-  int col, row;
-  rend_t tr;
-
   want_refresh = 1;
   ZERO_SCROLLBACK ();
 
@@ -1458,24 +1459,31 @@
   selection_check (1);
   min_it (count, ncol - screen.cur.col);
 
-  row = screen.cur.row;
+  int row = screen.cur.row;
 
   line_t *line = &ROW(row);
 
   line->touch ();
   line->is_longer (0);
 
+  // nuke wide char at beginning
+  if (line->t[screen.cur.col] == NOCHAR)
+    scr_kill_char (*line, screen.cur.col);
+
   switch (insdel)
     {
       case INSERT:
-        for (col = ncol - 1; (col - count) >= screen.cur.col; col--)
+        line->l = min (line->l + count, ncol);
+
+        if (line->t[screen.cur.col] == NOCHAR)
+          scr_kill_char (*line, screen.cur.col);
+
+        for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
           {
             line->t[col] = line->t[col - count];
             line->r[col] = line->r[col - count];
           }
 
-        line->l = min (line->l + count, ncol);
-
         if (selection.op && current_screen == selection.screen
             && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
           {
@@ -1499,35 +1507,46 @@
         selection_check (1);
         screen.cur.col -= count;
 
+        // nuke wide char after the end
+        if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
+          scr_kill_char (*line, screen.cur.col + count);
+
         scr_blank_line (*line, screen.cur.col, count, rstyle);
         break;
 
       case DELETE:
-        tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
+        {
+          line->l = max (line->l - count, 0);
 
-        for (col = screen.cur.col; (col + count) < ncol; col++)
-          {
-            line->t[col] = line->t[col + count];
-            line->r[col] = line->r[col + count];
-          }
+          rend_t tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask);
 
-        line->l = max (line->l - count, 0);
-        scr_blank_line (*line, ncol - count, count, tr);
+          for (int col = screen.cur.col; (col + count) < ncol; col++)
+            {
+              line->t[col] = line->t[col + count];
+              line->r[col] = line->r[col + count];
+            }
 
-        if (selection.op && current_screen == selection.screen
-            && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
-          {
-            if (selection.end.row != screen.cur.row
-                || (screen.cur.col >= selection.beg.col - count)
-                || selection.end.col >= ncol)
-              CLEAR_SELECTION ();
-            else
-              {
-                /* shift selection */
-                selection.beg.col  -= count;
-                selection.mark.col -= count; /* XXX: yes? */
-                selection.end.col  -= count;
-              }
+          // nuke wide char at the end
+          if (line->t[screen.cur.col] == NOCHAR)
+            scr_kill_char (*line, screen.cur.col);
+
+          scr_blank_line (*line, ncol - count, count, tr);
+
+          if (selection.op && current_screen == selection.screen
+              && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
+            {
+              if (selection.end.row != screen.cur.row
+                  || (screen.cur.col >= selection.beg.col - count)
+                  || selection.end.col >= ncol)
+                CLEAR_SELECTION ();
+              else
+                {
+                  /* shift selection */
+                  selection.beg.col  -= count;
+                  selection.mark.col -= count; /* XXX: yes? */
+                  selection.end.col  -= count;
+                }
+            }
           }
 
         break;