Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

diff --cc lisp/files.el
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/frame.el
Simple merge

diff --cc lisp/international/mule-cmds.el
index 712728fcd2abfe3faeb7eb0d8d7fa0fcdf8518ee,7756aa58ccd8fa869af4c5a8ae344e07e0b9e8e3..b66243f22703e12d578259ec7dc87977ed24e05b
--- 1/lisp/international/mule-cmds.el
--- 2/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@@ -1786,10 -1795,12 +1795,12 @@@ The default status is as follows
  
  (reset-language-environment)
  
 -(defun set-display-table-and-terminal-coding-system (language-name &optional coding-system)
 +(defun set-display-table-and-terminal-coding-system (language-name &optional coding-system display)
    "Set up the display table and terminal coding system for LANGUAGE-NAME."
    (let ((coding (get-language-info language-name 'unibyte-display)))
-     (if coding
+     (if (and coding
+            (or (not coding-system)
+                (coding-system-equal coding coding-system)))
        (standard-display-european-internal)
        ;; The following 2 lines undo the 8-bit display that we set up
        ;; in standard-display-european-internal, which see.  This is in

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc man/cc-mode.texi
index a59c022625730a6ac3a118abb02c7f5744fa8cb3,92d4ac20aa0db99162371c93b9f10a55d406ca8d..0d6e88f20eaed96f87f661e4b58dcb83e0af796e
--- 1/man/cc-mode.texi
--- 2/man/cc-mode.texi
+++ b/man/cc-mode.texi
@@@ -114,6 -207,10 +207,10 @@@ license to the document, as described i
  @page
  @vskip 0pt plus 1filll
  @insertcopying
 -This manual was generated from $Revision: 5.241 $ of $RCSfile: cc-mode.texi,v $, which can be
+ 
++This manual was generated from $Revision: 1.32 $ of $RCSfile: cc-mode.texi,v $, which can be
+ downloaded from
+ @url{http://cvs.sf.net/viewcvs.py/cc-mode/cc-mode/cc-mode.texi}.
  @end titlepage
  
  @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

diff --cc src/fileio.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xterm.h
Simple merge