--- rxvt-unicode/src/screen.C	2010/08/28 11:03:04	1.347
+++ rxvt-unicode/src/screen.C	2010/10/15 21:13:44	1.353
@@ -146,6 +146,8 @@
   rend_t rend = l.r[col] & ~RS_baseattrMask;
   rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
 
+  l.touch ();
+
   // found start, nuke
   do {
     l.t[col] = ' ';
@@ -900,25 +902,29 @@
 # endif
 #endif
 
-          // nuke the character at this position, if required
-          if (expect_false (
-                line->t[screen.cur.col] == NOCHAR
-                || (screen.cur.col < ncol - 1
-                    && line->t[screen.cur.col + 1] == NOCHAR)
-             ))
-            scr_kill_char (*line, screen.cur.col);
-
           rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
 
           // if the character doesn't fit into the remaining columns...
           if (expect_false (screen.cur.col > ncol - width && ncol >= width))
             {
-              // ... artificially enlargen the previous one
-              c = NOCHAR;
-              // and try the same character next loop iteration
-              --str;
+              if (screen.flags & Screen_Autowrap)
+                {
+                  // ... artificially enlargen the previous one
+                  c = NOCHAR;
+                  // and try the same character next loop iteration
+                  --str;
+                }
+              else
+                screen.cur.col = ncol - width;
             }
 
+          // nuke the character at this position, if required
+          // due to wonderful coincidents everywehere else in this loop
+          // we never have to check for overwriting a wide char itself,
+          // only it's tail.
+          if (expect_false (line->t[screen.cur.col] == NOCHAR))
+            scr_kill_char (*line, screen.cur.col);
+
           line->touch ();
 
           do
@@ -933,7 +939,8 @@
                   line->l = ncol;
                   if (screen.flags & Screen_Autowrap)
                     screen.flags |= Screen_WrapNext;
-                  break;
+
+                  goto end_of_line;
                 }
 
               c = NOCHAR;
@@ -941,16 +948,14 @@
           while (expect_false (--width > 0));
 
           // pad with spaces when overwriting wide character with smaller one
-          if (expect_false (!width))
+          for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
             {
-              line->touch ();
-
-              for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
-                {
-                  line->t[c] = ' ';
-                  line->r[c] = rend;
-                }
+              line->t[c] = ' ';
+              line->r[c] = rend;
             }
+
+end_of_line:
+          ;
         }
 #if ENABLE_COMBINING
       else // width == 0
@@ -1023,6 +1028,8 @@
 #endif
         }
     }
+  else if (screen.flags & Screen_WrapNext)
+    screen.flags &= ~Screen_WrapNext;
   else
     scr_gotorc (0, -1, RELATIVE);
 }