# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1090673380 0
# Node ID 5044b3527ce8ed89e065eaf3cfa12282c89bda43
# Parent  d341e83af4f240a98a4a4ca33774ed2962f5533e
(x_icon_verify): New function.
(Fx_create_frame): Use it.

(From Richard Stallman.)

diff -r d341e83af4f2 -r 5044b3527ce8 src/xfns.c
--- a/src/xfns.c	Sat Jul 24 04:52:27 2004 +0000
+++ b/src/xfns.c	Sat Jul 24 12:49:40 2004 +0000
@@ -2633,6 +2633,28 @@
 #endif /* not USE_GTK */
 #endif /* not USE_X_TOOLKIT */
 
+/* Verify that the icon position args for this window are valid.  */
+
+static void
+x_icon_verify (f, parms)
+     struct frame *f;
+     Lisp_Object parms;
+{
+  Lisp_Object icon_x, icon_y;
+
+  /* Set the position of the icon.  Note that twm groups all
+     icons in an icon window.  */
+  icon_x = x_frame_get_and_record_arg (f, parms, Qicon_left, 0, 0, RES_TYPE_NUMBER);
+  icon_y = x_frame_get_and_record_arg (f, parms, Qicon_top, 0, 0, RES_TYPE_NUMBER);
+  if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound))
+    {
+      CHECK_NUMBER (icon_x);
+      CHECK_NUMBER (icon_y);
+    }
+  else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound))
+    error ("Both left and top icon corners of icon must be specified");
+}
+
 /* Handle the icon stuff for this window.  Perhaps later we might
    want an x_set_icon_position which can be called interactively as
    well.  */
@@ -3117,6 +3139,8 @@
   tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN);
   f->no_split = minibuffer_only || EQ (tem, Qt);
 
+  x_icon_verify (f, parms);
+
   /* Create the X widget or window.  */
 #ifdef USE_X_TOOLKIT
   x_window (f, window_prompting, minibuffer_only);