aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2001-11-15 16:16:23 +0000
committerGerd Moellmann2001-11-15 16:16:23 +0000
commit9f7e52b4de1a3e79d69002c3d5491dde26826f01 (patch)
treeccc8aadb9e259f94e2abe5ba99f4508a79df658e /src
parenta10b6ff1a9e9845771275356208e0ae0326415f8 (diff)
downloademacs-9f7e52b4de1a3e79d69002c3d5491dde26826f01.tar.gz
emacs-9f7e52b4de1a3e79d69002c3d5491dde26826f01.zip
(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.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog11
-rw-r--r--src/xfns.c15
2 files changed, 17 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 79a59b903d3..583080f9ffd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,16 @@
12001-11-15 Gerd Moellmann <gerd@gnu.org> 12001-11-15 Gerd Moellmann <gerd@gnu.org>
2 2
3 * xfns.c (x_set_frame_parameters): Revert change of 2001-11-07.
4 Some x_set_* function expect to be called even if old and new
5 value are equal.
6
7 * xdisp.c (build_desired_tool_bar_string): Accept zero
8 tool_bar_button_relief.
9
10 * xfns.c (Fx_create_frame): Accept zero tool_bar_button_relief.
11
12 * xterm.c (x_draw_image_relief): Accept zero tool_bar_button_relief.
13
3 * xterm.c (x_draw_bar_cursor): If the background color of the 14 * xterm.c (x_draw_bar_cursor): If the background color of the
4 glyph under the cursor equals the frame's cursor color, use 15 glyph under the cursor equals the frame's cursor color, use
5 the glyph's foreground color for drawing the bar cursor. 16 the glyph's foreground color for drawing the bar cursor.
diff --git a/src/xfns.c b/src/xfns.c
index 4a4a44e7a06..7132aa858ce 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -950,16 +950,13 @@ x_set_frame_parameters (f, alist)
950 950
951 old_value = get_frame_param (f, prop); 951 old_value = get_frame_param (f, prop);
952 952
953 //if (NILP (Fequal (val, old_value))) 953 store_frame_param (f, prop, val);
954 {
955 store_frame_param (f, prop, val);
956 954
957 param_index = Fget (prop, Qx_frame_parameter); 955 param_index = Fget (prop, Qx_frame_parameter);
958 if (NATNUMP (param_index) 956 if (NATNUMP (param_index)
959 && (XFASTINT (param_index) 957 && (XFASTINT (param_index)
960 < sizeof (x_frame_parms)/sizeof (x_frame_parms[0]))) 958 < sizeof (x_frame_parms)/sizeof (x_frame_parms[0])))
961 (*x_frame_parms[XINT (param_index)].setter)(f, val, old_value); 959 (*x_frame_parms[XINT (param_index)].setter)(f, val, old_value);
962 }
963 } 960 }
964 } 961 }
965 962