(printchar): Cancel previous change.

src/print.c

@@ -417,15 +417,10 @@ printchar (ch, fun)
 
       /* Convert message to multibyte if we are now adding multibyte text.  */
       if (! NILP (current_buffer->enable_multibyte_characters)
-	  && len > 1
-	  && ! message_enable_multibyte)
-	{
-	  /* If we have already had some message text in the messsage
-             buffer, we must convert it to multibyte.  */
-	  if (printbufidx > 0)
+	  && ! message_enable_multibyte
+	  && printbufidx > 0)
 	{
-	      int size
-		= count_size_as_multibyte (FRAME_MESSAGE_BUF (mini_frame),
+	  int size = count_size_as_multibyte (FRAME_MESSAGE_BUF (mini_frame),
 					      printbufidx);
 	  unsigned char *tembuf = (unsigned char *) alloca (size + 1);
 	  copy_text (FRAME_MESSAGE_BUF (mini_frame), tembuf, printbufidx,
@@ -439,7 +434,6 @@ printchar (ch, fun)
 		printbufidx--;
 	    }
 	  bcopy (tembuf, FRAME_MESSAGE_BUF (mini_frame), printbufidx);
-	    }
 	  message_enable_multibyte = 1;
 	}