Merged in changes from CVS HEAD

Patches applied:

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

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

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

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

diff --cc lib-src/rcs2log
index f3773e4876641bd57611b908b374749efccbc110,9528e6b1d9c7ca3c588291e982225f7708ab90ca..4400fb72578e520401b42ca3ee6f13b35678941c
--- 1/lib-src/rcs2log
--- 2/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@@ -29,9 -29,9 +29,9 @@@ Options
  
  Report bugs to <bug-gnu-emacs@gnu.org>.'
  
--Id='$Id: rcs2log,v 1.51 2003/09/01 15:45:03 miles Exp $'
++Id='$Id: rcs2log,v 1.52 2003/12/27 08:18:08 uid65632 Exp $'
  
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003
  #  Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify

diff --cc src/Makefile.in
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/w32term.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xterm.c
Simple merge