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

diff --git a/src/EmacsShell.c b/src/EmacsShell.c
index 279c241..db72310 100644
--- a/src/EmacsShell.c
+++ b/src/EmacsShell.c
@@ -25,16 +25,17 @@ 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"
 
+#define ABORT abort
+
 #if 0 /* Not currently used */
 
 /* The root_geometry_manager() method in Shell.c is fucked up with regard
@@ -140,17 +141,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
@@ -160,10 +158,10 @@ EmacsShellUpdateSizeHints (Widget gw)
     TopLevelEmacsShellUpdateSizeHints (gw);
 #ifdef EXTERNAL_WIDGET
   else if (XtIsSubclass (gw, externalShellWidgetClass))
-    /* do what ??? Don't abort! */;
+    /* do what ??? Don't ABORT! */;
 #endif
   else if (XtIsSubclass (gw, transientEmacsShellWidgetClass))
     TransientEmacsShellUpdateSizeHints (gw);
   else
-    abort ();
+    ABORT ();
 }