Merged in changes from CVS trunk.

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc etc/TODO
index 1249e57,ab6ca16..ca88356
--- 1/etc/TODO
--- 2/etc/TODO
+++ b/etc/TODO
@@@ -111,7 -123,7 +123,7 @@@ to the FSF
    thread has processed the MENU_BAR_ACTIVATE_EVENT and regenerated
    the whole menu bar.  In the mean time, it should process other messages.
  
- * Get some major packages installed: W3/url (development version needs
 -** Get some major packages installed: W3 (development version needs
++** Get some major packages installed: W3/url (development version needs
    significant work), PSGML.  Check the assignments file for other
    packages which might go in and have been missed.
  
@@@ -120,21 -132,18 +132,21 @@@
    multiple inheritance ?  faster where-is ?  no more fix_submap_inheritance ?
    what else ?
  
- * Provide real menus on ttys.  The MS-DOS implementation can serve as
+ ** Provide real menus on ttys.  The MS-DOS implementation can serve as
    an example how to do part of this.
  
- * Implement popular parts of the rest of the CL functions as compiler
+ ** Implement popular parts of the rest of the CL functions as compiler
    macros in cl-macs.
  
- * Highlight rectangles (`mouse-track-rectangle-p' in XEmacs).  Already in CUA,
+ ** Highlight rectangles (`mouse-track-rectangle-p' in XEmacs).  Already in CUA,
    but it's a valuable feature worth making more general.
  
- * Support simultaneous tty and X frames.  [For a partial
 -** Support simultaneous tty and X frames.
++** Support simultaneous tty and X frames.  [For a partial
 +  implementation, see tla branch
 +  lorentey@elte.hu--2004/emacs--multi-tty--0 at
 +  http://lorentey.web.elte.hu/arch/2004]
  
- * Provide MIME support for Rmail using the Gnus MIME library.  [Maybe
+ ** Provide MIME support for Rmail using the Gnus MIME library.  [Maybe
    not now feasible, given Gnus maintenance decisions.  fx looked at
    this and can say where some of the problems are.]
  

diff --cc lisp/Makefile.in
Simple merge

diff --cc lisp/frame.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/x-dnd.el
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/fontset.c
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keymap.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/w32term.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/window.h
Simple merge

diff --cc src/xdisp.c
index 3c144f4,f51727d..fd621fe
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -18488,8 -18590,9 +18589,9 @@@ x_produce_glyphs (it
  
          it->nglyphs = 1;
  
-         pcm = FRAME_RIF (it->f)->per_char_metric (font, &char2b,
-                                                     FONT_TYPE_FOR_UNIBYTE (font, it->char_to_display));
 -        pcm = rif->per_char_metric (font, &char2b,
 -                                    FONT_TYPE_FOR_UNIBYTE (font, it->char_to_display));
++        pcm = FRAME_RIF (it->f)->per_char_metric
++            (font, &char2b, FONT_TYPE_FOR_UNIBYTE (font, it->char_to_display));
+ 
          it->ascent = FONT_BASE (font) + boff;
          it->descent = FONT_DESCENT (font) - boff;
  

diff --cc src/xterm.c
Simple merge

diff --cc src/xterm.h
Simple merge