X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2FEmacsShell.c;h=7eac51a1e4ff94cb9d26b9673c750d37bdfb21a6;hb=4faa92777f0b49cc67da8ab24a5d6e66e845f963;hp=279c2413df37a0f26a0d947e13a48a688be3c763;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git-

diff --git a/src/EmacsShell.c b/src/EmacsShell.c
index 279c241..7eac51a 100644
--- a/src/EmacsShell.c
+++ b/src/EmacsShell.c
@@ -25,13 +25,12 @@ Boston, MA 02111-1307, USA.  */
 #include <config.h>
 
 #include <stdio.h>
+#include <assert.h>
 #include <stdlib.h>
 #include <X11/StringDefs.h>
 #include "xintrinsicp.h"
 #include <X11/Shell.h>
 #include <X11/ShellP.h>
-#include <X11/Vendor.h>
-#include <X11/VendorP.h>
 #include "EmacsShell.h"
 #include "ExternalShell.h"
 
@@ -140,17 +139,14 @@ EmacsShellSetPositionUserSpecified (Widget gw)
 void
 EmacsShellSmashIconicHint (Widget shell, int iconic_p)
 {
-  /* See comment in xfns.c about this */
-  WMShellWidget wmshell;
-  int old, new;
-  if (! XtIsSubclass (shell, wmShellWidgetClass)) abort ();
-  wmshell = (WMShellWidget) shell;
-  old = (wmshell->wm.wm_hints.flags & StateHint
-	 ? wmshell->wm.wm_hints.initial_state
-	 : NormalState);
-  new = (iconic_p ? IconicState : NormalState);
+  /* See comment in frame-x.c about this */
+  WMShellWidget wmshell = (WMShellWidget) shell;
+  assert (XtIsSubclass (shell, wmShellWidgetClass));
+  /* old_state = (wmshell->wm.wm_hints.flags & StateHint
+                  ? wmshell->wm.wm_hints.initial_state
+                  : NormalState); */
   wmshell->wm.wm_hints.flags |= StateHint;
-  wmshell->wm.wm_hints.initial_state = new;
+  wmshell->wm.wm_hints.initial_state = iconic_p ? IconicState : NormalState;
 }
 
 void