changeset 56781:c54fa35b4ded

* 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.
author Jan Djärv <jan.h.d@swipnet.se>
date Tue, 24 Aug 2004 10:54:39 +0000
parents 69e7e4eb798f
children 1dac05def6d8
files src/ChangeLog src/xfns.c
diffstat 2 files changed, 16 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Aug 24 03:45:41 2004 +0000
+++ b/src/ChangeLog	Tue Aug 24 10:54:39 2004 +0000
@@ -1,3 +1,9 @@
+2004-08-24  Jan Dj,Ad(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,
--- a/src/xfns.c	Tue Aug 24 03:45:41 2004 +0000
+++ b/src/xfns.c	Tue Aug 24 10:54:39 2004 +0000
@@ -281,6 +281,8 @@
   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 @@
   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 @@
   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 @@
   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 @@
   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);