2 files changed, 10 insertions, 6 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 49555f098f8..a0168a7afc1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * w32fns.c (Fw32_define_rgb_color): Avoid XSET.
+
 2004-05-14  Kenichi Handa  <handa@m17n.org>
 
         * ccl.c (Fccl_execute_on_string): Fix setting elements of STATUS.
@@ -7,7 +11,7 @@
         * lisp.h (Vx_resource_name, Vx_resource_class): Move from xfns.c
         section to frame.c section.
         (Fxw_display_color_p, Fx_file_dialog): Declare if
-        HAVE_WINDOW_SYSTEM defined.     
+        HAVE_WINDOW_SYSTEM defined.
         * macfns.c (Fx_create_frame): Fix int/Lisp_Object mixup.
         * macmenu.c (set_frame_menubar): Use NILP to test a lisp value.
         * macterm.c (mac_get_emulated_btn, mac_event_to_emacs_modifiers)
@@ -16,8 +20,8 @@
         (mac_check_for_quit_char): Fix pointer/Lisp_Object mixup.
         * macterm.h (struct frame, struct face, struct image)
         (display_x_get_resource, Fx_display_color_p)
-        (Fx_display_grayscale_p, Fx_display_planes, x_free_gcs): Add
-        prototypes.
+        (Fx_display_grayscale_p, Fx_display_planes, x_free_gcs):
+        Add prototypes.
 
 2004-05-14  Kim F. Storm  <storm@cua.dk>
 
@@ -1555,7 +1559,7 @@
 
 2004-02-09  Sam Steingold  <sds@gnu.org>
 
-        * w32term.c (w32_draw_fringe_bitmap): Fixed a typo in the last patch.
+        * w32term.c (w32_draw_fringe_bitmap): Fix a typo in the last patch.
 
 2004-02-09  Kim F. Storm  <storm@cua.dk>
 
diff --git a/src/w32fns.c b/src/w32fns.c
index fc40f5f68da..20b07413033 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1,5 +1,5 @@
 /* Graphical user interface functions for the Microsoft W32 API.
-   Copyright (C) 1989, 92, 93, 94, 95, 1996, 1997, 1998, 1999, 2000, 2001
+   Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 1999, 2000, 01, 2004
      Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -465,7 +465,7 @@ if the entry is new.  */)
   CHECK_NUMBER (blue);
   CHECK_STRING (name);
 
-  XSET (rgb, Lisp_Int, RGB(XUINT (red), XUINT (green), XUINT (blue)));
+  XSETINT (rgb, RGB(XUINT (red), XUINT (green), XUINT (blue)));
 
   BLOCK_INPUT;