A fix to build Emacs with latest CVS sources

[David PONCE]

Hi All,

It looks that Kim's recent change to merge image support is missing
something, and breaks Emacs build.

FYI, here is the patch I had to apply to fix the issue.

Sincerely,
David

Index: src/Makefile.in
===================================================================
RCS file: /cvsroot/emacs/emacs/src/Makefile.in,v
retrieving revision 1.292
diff -c -r1.292 Makefile.in
*** src/Makefile.in     11 Mar 2004 00:29:25 -0000      1.292
--- src/Makefile.in     11 Mar 2004 10:50:11 -0000
***************
*** 310,318 ****
  /* Include xmenu.o in the list of X object files.  */
  
  #ifdef USE_GTK
! XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o fringe.o
  #else
! XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o
  #endif
  
  /* The X Menu stuff is present in the X10 distribution, but missing
--- 310,318 ----
  /* Include xmenu.o in the list of X object files.  */
  
  #ifdef USE_GTK
! XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o gtkutil.o fringe.o 
image.o
  #else
! XOBJ= xterm.o xfns.o xselect.o xrdb.o fontset.o xsmfns.o fringe.o image.o
  #endif
  
  /* The X Menu stuff is present in the X10 distribution, but missing
Index: src/dispextern.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/dispextern.h,v
retrieving revision 1.166
diff -c -r1.166 dispextern.h
*** src/dispextern.h    11 Mar 2004 00:29:12 -0000      1.166
--- src/dispextern.h    11 Mar 2004 10:50:11 -0000
***************
*** 2609,2614 ****
--- 2609,2615 ----
  #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));
  
  /* Defined in sysdep.c */
  
Index: src/image.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/image.c,v
retrieving revision 1.3
diff -c -r1.3 image.c
*** src/image.c 11 Mar 2004 05:56:41 -0000      1.3
--- src/image.c 11 Mar 2004 10:50:11 -0000
***************
*** 2005,2011 ****
                              File Handling
   ***********************************************************************/
  
- static Lisp_Object x_find_image_file P_ ((Lisp_Object));
  static unsigned char *slurp_file P_ ((char *, int *));
  
  
--- 2005,2010 ----
***************
*** 2013,2019 ****
     x-bitmap-file-path.  Value is the full name of the file found, or
     nil if not found.  */
  
! static Lisp_Object
  x_find_image_file (file)
       Lisp_Object file;
  {
--- 2012,2018 ----
     x-bitmap-file-path.  Value is the full name of the file found, or
     nil if not found.  */
  
! Lisp_Object
  x_find_image_file (file)
       Lisp_Object file;
  {
Index: src/xfns.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xfns.c,v
retrieving revision 1.607
diff -c -r1.607 xfns.c
*** src/xfns.c  11 Mar 2004 00:25:38 -0000      1.607
--- src/xfns.c  11 Mar 2004 10:50:13 -0000
***************
*** 761,768 ****
  
  #ifdef USE_GTK
  
- static Lisp_Object x_find_image_file P_ ((Lisp_Object file));
- 
  /* Set icon from FILE for frame F.  By using GTK functions the icon
     may be any format that GdkPixbuf knows about, i.e. not just bitmaps.  */
  
--- 761,766 ----