# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1283059372 -32400
# Node ID c6fd83f300a8a337c55c0485cb3bee4f93057d58
# Parent  c896870df40462c0699e60db2b63afb318339995# Parent  4ebf7a925b3595f3800c364011d71382d37df793
merge emacs-23

diff -r 4ebf7a925b35 -r c6fd83f300a8 src/ChangeLog
--- a/src/ChangeLog	Sat Aug 28 13:01:36 2010 -0700
+++ b/src/ChangeLog	Sun Aug 29 14:22:52 2010 +0900
@@ -1,3 +1,8 @@
+2010-08-29  Kenichi Handa  <handa@m17n.org>
+
+	* term.c (encode_terminal_code): Encode byte chars to the
+	correspnding bytes.
+
 2010-08-17  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* eval.c (Flet, Feval, Fapply, apply_lambda): Use SAFE_ALLOCA_LISP
diff -r 4ebf7a925b35 -r c6fd83f300a8 src/term.c
--- a/src/term.c	Sat Aug 28 13:01:36 2010 -0700
+++ b/src/term.c	Sun Aug 29 14:22:52 2010 +0900
@@ -695,7 +695,12 @@
 						  encode_terminal_src_size);
 		  buf = encode_terminal_src + nbytes;
 		}
-	      if (char_charset (c, charset_list, NULL))
+	      if (CHAR_BYTE8_P (c))
+		{
+		  *buf++ = CHAR_TO_BYTE8 (c);
+		  nchars++;
+		}
+	      else if (char_charset (c, charset_list, NULL))
 		{
 		  /* Store the multibyte form of C at BUF.  */
 		  buf += CHAR_STRING (c, buf);
diff -r 4ebf7a925b35 -r c6fd83f300a8 src/xmenu.c