Merge from origin/emacs-24

[gnu-emacs] / src / frame.h

diff --git a/src/frame.h b/src/frame.h
index 6f5de3f5689ffe9c7939cf4515db00a70d73c0ac..8ee37dfd695e808417eebe8e96f11b8563849ce4 100644 (file)
--- a/src/frame.h
+++ b/src/frame.h
@@ -396,10 +396,6 @@ struct frame
      widths) in pixels.  */
   int pixel_width, pixel_height;
 
-  /* These many pixels are the difference between the outer window (i.e. the
-     left and top of the window manager decoration) and FRAME_X_WINDOW.  */
-  int x_pixels_diff, y_pixels_diff;
-
   /* This is the gravity value for the specified window position.  */
   int win_gravity;
 
@@ -1415,7 +1411,6 @@ extern void x_sync (struct frame *);
 #endif /* HAVE_X_WINDOWS */
 
 extern void x_query_colors (struct frame *f, XColor *, int);
-extern void x_query_color (struct frame *f, XColor *);
 extern void x_focus_frame (struct frame *);
 
 #ifndef HAVE_NS
@@ -1429,7 +1424,7 @@ x_set_bitmap_icon (struct frame *f)
 {
   Lisp_Object obj = assq_no_quit (Qicon_type, f->param_alist);
 
-  if (CONSP (obj))
+  if (CONSP (obj) && !NILP (XCDR (obj)))
     x_bitmap_icon (f, XCDR (obj));
 }