(x_set_frame_parameters): Revert change of 2001-11-07.

Some x_set_* function expect to be called even if old and new
value are equal.

diff --git a/src/ChangeLog b/src/ChangeLog
index 79a59b903d3201a307673b4f5467c9ae0d89910f..583080f9ffd1005fccfe9de7b52a521c545a9461 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,16 @@
 2001-11-15  Gerd Moellmann  <gerd@gnu.org>
 
+       * xfns.c (x_set_frame_parameters): Revert change of 2001-11-07.
+       Some x_set_* function expect to be called even if old and new
+       value are equal.
+
+       * xdisp.c (build_desired_tool_bar_string): Accept zero
+       tool_bar_button_relief.
+
+       * xfns.c (Fx_create_frame): Accept zero tool_bar_button_relief.
+
+       * xterm.c (x_draw_image_relief): Accept zero tool_bar_button_relief.
+       
        * xterm.c (x_draw_bar_cursor): If the background color of the
        glyph under the cursor equals the frame's cursor color, use
        the glyph's foreground color for drawing the bar cursor.

diff --git a/src/xfns.c b/src/xfns.c
index 4a4a44e7a06411068516c49bdf2f68446b02fafd..7132aa858ce6eb9ba534902fafc96463901fa71c 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -950,16 +950,13 @@ x_set_frame_parameters (f, alist)
 
          old_value = get_frame_param (f, prop);
 
-         //if (NILP (Fequal (val, old_value)))
-           {
-             store_frame_param (f, prop, val);
+         store_frame_param (f, prop, val);
 
-             param_index = Fget (prop, Qx_frame_parameter);
-             if (NATNUMP (param_index)
-                 && (XFASTINT (param_index)
-                     < sizeof (x_frame_parms)/sizeof (x_frame_parms[0])))
-               (*x_frame_parms[XINT (param_index)].setter)(f, val, old_value);
-           }
+         param_index = Fget (prop, Qx_frame_parameter);
+         if (NATNUMP (param_index)
+             && (XFASTINT (param_index)
+                 < sizeof (x_frame_parms)/sizeof (x_frame_parms[0])))
+           (*x_frame_parms[XINT (param_index)].setter)(f, val, old_value);
        }
     }