Merged in changes from CVS HEAD

Patches applied:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc lisp/emacs-lisp/bytecomp.el
index 6f7e838daf06bcfa0421ea7a03ea41bb8d0d3c55,f4bcb3535187dfaf9750152ac1920a19bf391db4..1a290dddc5877aba99fac931b882c221b24ba784
--- 1/lisp/emacs-lisp/bytecomp.el
--- 2/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@@ -10,7 -10,7 +10,7 @@@
  
  ;;; This version incorporates changes up to version 2.10 of the
  ;;; Zawinski-Furuseth compiler.
--(defconst byte-compile-version "$Revision: 2.142 $")
++(defconst byte-compile-version "$Revision: 2.143 $")
  
  ;; This file is part of GNU Emacs.
  

diff --cc lisp/server.el
Simple merge

diff --cc lisp/vc-hooks.el
index 01c9e2f428948f0e67a9feb74c8c359940a14b62,1354d442e268154e2ea71b16d2799fc94d37435c..baed1ace6ed8df5ececd317154b182289cf652a7
--- 1/lisp/vc-hooks.el
--- 2/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@@ -6,7 -6,7 +6,7 @@@
  ;; Author:     FSF (see vc.el for full credits)
  ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
  
--;; $Id: vc-hooks.el,v 1.160 2003/09/01 15:45:17 miles Exp $
++;; $Id: vc-hooks.el,v 1.161 2004/03/15 03:53:05 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  

diff --cc lisp/vc.el
index 5ef5711331da4a6def2b4dca51857ebc95f5520d,b6953b157a4f43f81ca138b8de727bc9effcf1ac..e347598055a3a162fa7e8a5ec72fa57d03f6d9ae
--- 1/lisp/vc.el
--- 2/lisp/vc.el
+++ b/lisp/vc.el
@@@ -7,7 -7,7 +7,7 @@@
  ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
  ;; Keywords: tools
  
--;; $Id: vc.el,v 1.367 2004/02/08 22:42:42 uid65629 Exp $
++;; $Id: vc.el,v 1.368 2004/03/15 03:55:24 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  

diff --cc src/Makefile.in
index 775c454e8137ed8a03edc393426c0878c8000f18,678e4f89f44266a87d5e84c0b7b7728eff77d3fb..618d8de1f968bbc8938eca87c0cd8b3e9b6ad8f4
--- 1/src/Makefile.in
--- 2/src/Makefile.in
+++ b/src/Makefile.in
@@@ -1079,8 -1079,10 +1081,10 @@@ frame.o: frame.c xterm.h window.h frame
     msdos.h dosfns.h dispextern.h $(config_h)
  fringe.o: fringe.c dispextern.h frame.h window.h buffer.h $(config_h)
  fontset.o: dispextern.h fontset.h fontset.c ccl.h buffer.h charset.h frame.h \
 -   keyboard.h $(config_h)
 +   keyboard.h termhooks.h $(config_h)
  getloadavg.o: getloadavg.c $(config_h)
+ image.o: image.c frame.h window.h dispextern.h blockinput.h atimer.h \
+    systime.h xterm.h w32term.h w32gui.h macterm.h macgui.h $(config_h)
  indent.o: indent.c frame.h window.h indent.h buffer.h $(config_h) termchar.h \
     termopts.h disptab.h region-cache.h charset.h composite.h dispextern.h \
     keyboard.h

diff --cc src/dispextern.h
index 00a27a9b3261df0f2599823377495ea74e67ada1,d925f881695f1f52fd3e9a2789a40e3692752a25..63c88119c96f136318a1feafea6e8b6ffe9ba8a0
--- 1/src/dispextern.h
--- 2/src/dispextern.h
+++ b/src/dispextern.h
@@@ -2591,13 -2602,48 +2598,48 @@@ void w32_init_fringe P_ ((void))
  void w32_reset_fringes P_ ((void));
  #endif
  
+ /* Defined in image.c */
+ 
+ #ifdef HAVE_WINDOW_SYSTEM
+ 
+ extern int x_bitmap_height P_ ((struct frame *, int));
+ extern int x_bitmap_width P_ ((struct frame *, int));
+ extern int x_bitmap_pixmap P_ ((struct frame *, int));
+ extern void x_reference_bitmap P_ ((struct frame *, int));
+ extern int x_create_bitmap_from_data P_ ((struct frame *, char *,
+                                         unsigned int, unsigned int));
+ extern int x_create_bitmap_from_file P_ ((struct frame *, Lisp_Object));
+ #ifndef x_destroy_bitmap
+ extern void x_destroy_bitmap P_ ((struct frame *, int));
+ #endif
+ extern void x_destroy_all_bitmaps P_ ((Display_Info *));
+ extern int x_create_bitmap_mask P_ ((struct frame * , int));
+ extern Lisp_Object x_find_image_file P_ ((Lisp_Object));
+ 
+ void x_kill_gs_process P_ ((Pixmap, struct frame *));
+ struct image_cache *make_image_cache P_ ((void));
+ void free_image_cache P_ ((struct frame *));
+ void clear_image_cache P_ ((struct frame *, int));
+ void forall_images_in_image_cache P_ ((struct frame *,
+                                      void (*) P_ ((struct image *))));
+ int valid_image_p P_ ((Lisp_Object));
+ void prepare_image_for_display P_ ((struct frame *, struct image *));
+ int lookup_image P_ ((struct frame *, Lisp_Object));
+ 
+ unsigned long image_background P_ ((struct image *, struct frame *,
+                                   XImagePtr_or_DC ximg));
+ int image_background_transparent P_ ((struct image *, struct frame *,
+                                     XImagePtr_or_DC mask));
+ 
+ #endif
+ 
  /* Defined in sysdep.c */
  
 -void get_frame_size P_ ((int *, int *));
 +void get_tty_size P_ ((int, int *, int *));
  void request_sigio P_ ((void));
  void unrequest_sigio P_ ((void));
 -int tabs_safe_p P_ ((void));
 -void init_baud_rate P_ ((void));
 +int tabs_safe_p P_ ((int));
 +void init_baud_rate P_ ((int));
  void init_sigio P_ ((int));
  
  /* Defined in xfaces.c */

diff --cc src/emacs.c
index e74c9eaf41278d8ab07dcc0da5f053bdfe6ebae0,43f300eca9f2334f0b1bc8ef25ccba8926620caf..43d2f8541ee938ba81c244e645d33ee821577c62
--- 1/src/emacs.c
--- 2/src/emacs.c
+++ b/src/emacs.c
@@@ -1582,16 -1591,7 +1585,13 @@@ main (argc, arg
  #ifdef VMS
    init_vmsproc ();    /* And this too.  */
  #endif /* VMS */
 -  init_sys_modes ();  /* Init system terminal modes (RAW or CBREAK, etc.).  */
 +  if (!noninteractive)
 +    {
 +#ifdef VMS
 +      init_vms_input ();/* init_display calls get_tty_size, that needs this.  */
 +#endif /* VMS */
 +      init_display ();        /* Determine terminal type.  Calls init_sys_modes.  */
 +    }
- #if defined (HAVE_X_WINDOWS) || defined (WINDOWSNT) || defined (HAVE_CARBON)
-   init_xfns ();
- #endif /* HAVE_X_WINDOWS */
    init_fns ();
    init_xdisp ();
  #ifdef HAVE_WINDOW_SYSTEM

diff --cc src/lisp.h
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/macterm.h
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xterm.h
Simple merge