aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKároly Lőrentey2006-03-12 01:37:34 +0000
committerKároly Lőrentey2006-03-12 01:37:34 +0000
commita9d54793ea232d6c6b93cf10477216e4361abcec (patch)
tree625ccb394eaf2291aa6f7a7763da22ebdf394ebf /src
parent83c7a27bc0184b0eb63eb79b5a4edb40c74fd7a5 (diff)
downloademacs-a9d54793ea232d6c6b93cf10477216e4361abcec.tar.gz
emacs-a9d54793ea232d6c6b93cf10477216e4361abcec.zip
(x_icon): Disable redundant call to `x_wm_set_window_state'.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/xfns.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 68178e2c4d3..16565f77c03 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12006-03-12 L$,1 q(Brentey K,Aa(Broly <lorentey@elte.hu>
2
3 * xfns.c (x_icon): Disable redundant call to `x_wm_set_window_state'.
4
12006-03-11 Jason Rumney <jasonr@gnu.org> 52006-03-11 Jason Rumney <jasonr@gnu.org>
2 6
3 * w32fns.c (signal_user_input): New function. 7 * w32fns.c (signal_user_input): New function.
diff --git a/src/xfns.c b/src/xfns.c
index 2ab185a3c2d..5d580c9a1f1 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -2821,12 +2821,15 @@ x_icon (f, parms)
2821 if (! EQ (icon_x, Qunbound)) 2821 if (! EQ (icon_x, Qunbound))
2822 x_wm_set_icon_position (f, XINT (icon_x), XINT (icon_y)); 2822 x_wm_set_icon_position (f, XINT (icon_x), XINT (icon_y));
2823 2823
2824#if 0 /* x_get_arg removes the visibility parameter as a side effect,
2825 but x_create_frame still needs it. */
2824 /* Start up iconic or window? */ 2826 /* Start up iconic or window? */
2825 x_wm_set_window_state 2827 x_wm_set_window_state
2826 (f, (EQ (x_get_arg (dpyinfo, parms, Qvisibility, 0, 0, RES_TYPE_SYMBOL), 2828 (f, (EQ (x_get_arg (dpyinfo, parms, Qvisibility, 0, 0, RES_TYPE_SYMBOL),
2827 Qicon) 2829 Qicon)
2828 ? IconicState 2830 ? IconicState
2829 : NormalState)); 2831 : NormalState));
2832#endif
2830 2833
2831 x_text_icon (f, (char *) SDATA ((!NILP (f->icon_name) 2834 x_text_icon (f, (char *) SDATA ((!NILP (f->icon_name)
2832 ? f->icon_name 2835 ? f->icon_name