From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 29 Aug 2007 21:45:22 +0000 (+0000)
Subject: (check_x_display_info): Yet Another Int/Lisp_Object Mixup.
X-Git-Tag: emacs-pretest-23.0.90~11211
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fd0f53a90906db0dec3084f3085b7edd21c6c779;p=emacs.git

(check_x_display_info): Yet Another Int/Lisp_Object Mixup.
(x_icon): Comment-out var only used in commented-out code.
---

diff --git a/src/xfns.c b/src/xfns.c
index e49f8cb3112..14e5b058e32 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -280,7 +280,7 @@ check_x_display_info (object)
     }
   else if (INTEGERP (object))
     {
-      struct terminal *t = get_terminal (XINT (object), 1);
+      struct terminal *t = get_terminal (object, 1);
 
       if (t->type != output_x_window)
         error ("Terminal %d is not an X display", XINT (object));
@@ -2874,7 +2874,9 @@ x_icon (f, parms)
      Lisp_Object parms;
 {
   Lisp_Object icon_x, icon_y;
+#if 0
   struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
+#endif
 
   /* Set the position of the icon.  Note that twm groups all
      icons in an icon window.  */