* xfns.c (x_window_to_frame, x_any_window_to_frame)

(x_non_menubar_window_to_frame, x_menubar_window_to_frame)
(x_top_window_to_frame): Return 0 if wdesc is None.

diff --git a/src/ChangeLog b/src/ChangeLog
index cbf06bc480f2f045d290e30cec2e88c4399c39e6..35731460a7045c2f07234cfae960d2e207d28773 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-24  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
+
+       * xfns.c (x_window_to_frame, x_any_window_to_frame)
+       (x_non_menubar_window_to_frame, x_menubar_window_to_frame)
+       (x_top_window_to_frame): Return 0 if wdesc is None.
+
 2004-08-22  Richard M. Stallman  <rms@gnu.org>
 
        * process.c (process_send_signal) [SIGNALS_VIA_CHARACTERS,

diff --git a/src/xfns.c b/src/xfns.c
index 3f484f3935a89e5648741b597c898b83d466e597..8368e62a4459656a7cc4c8c723a36ccc1efcf4f6 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -281,6 +281,8 @@ x_window_to_frame (dpyinfo, wdesc)
   Lisp_Object tail, frame;
   struct frame *f;
 
+  if (wdesc == None) return 0;
+
   for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
     {
       frame = XCAR (tail);
@@ -330,6 +332,8 @@ x_any_window_to_frame (dpyinfo, wdesc)
   struct frame *f, *found;
   struct x_output *x;
 
+  if (wdesc == None) return NULL;
+
   found = NULL;
   for (tail = Vframe_list; GC_CONSP (tail) && !found; tail = XCDR (tail))
     {
@@ -384,6 +388,8 @@ x_non_menubar_window_to_frame (dpyinfo, wdesc)
   struct frame *f;
   struct x_output *x;
 
+  if (wdesc == None) return 0;
+
   for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
     {
       frame = XCAR (tail);
@@ -430,6 +436,8 @@ x_menubar_window_to_frame (dpyinfo, wdesc)
   struct frame *f;
   struct x_output *x;
 
+  if (wdesc == None) return 0;
+
   for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
     {
       frame = XCAR (tail);
@@ -475,6 +483,8 @@ x_top_window_to_frame (dpyinfo, wdesc)
   struct frame *f;
   struct x_output *x;
 
+  if (wdesc == None) return 0;
+
   for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
     {
       frame = XCAR (tail);