Merged in changes from CVS trunk.

Patches applied:

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-257
   {arch}/=cvs-sync-make-log: Use new features of tla-changelogs-to-log

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

diff --cc src/fileio.c
Simple merge

diff --cc src/msdos.c
Simple merge

diff --cc src/xdisp.c
index d5e12e685467a41c03a8642cce5e9a5814654925,54efa19c5cc7c0233005461c7da06f0342843e8c..e77fa98cab1a01592feda72ab45e61e2eed443a3
--- 1/src/xdisp.c
--- 2/src/xdisp.c
+++ b/src/xdisp.c
@@@ -21342,8 -21348,8 +21346,8 @@@ phys_cursor_in_rect_p (w, r
         I assume the effect is the same -- and this is portable.  */
        return x_intersect_rectangles (&cr, r, &result);
      }
--  else
--    return 0;
++  /* If we don't understand the format, pretend we're not in the hot-spot.  */
++  return 0;
  }