Merged from miles@gnu.org--gnu-2005 (patch 470-473)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-470
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-471
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-472
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-473
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-376

diff --cc lisp/international/mule-cmds.el
Simple merge

diff --cc lisp/international/mule.el
index 198ebaa,741a6c7..0c7c6f8
--- 1/lisp/international/mule.el
--- 2/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@@ -1254,9 -1256,12 +1263,12 @@@ The setting has no effect on graphical 
        (setq coding-system default-keyboard-coding-system))
    (if coding-system
        (setq default-keyboard-coding-system coding-system))
 -  (set-keyboard-coding-system-internal coding-system)
+   (if (and coding-system
+          (coding-system-get coding-system 'ascii-incompatible))
+       (error "%s is not ASCII-compatible" coding-system))
 +  (set-keyboard-coding-system-internal coding-system display)
    (setq keyboard-coding-system coding-system)
 -  (encoded-kbd-mode (if coding-system 1 0)))
 +  (encoded-kbd-setup-display display))
  
  (defcustom keyboard-coding-system nil
    "Specify coding system for keyboard input.

diff --cc src/macterm.c
Simple merge

diff --cc src/window.c
Simple merge