From: Chong Yidong <cyd@gnu.org>
Date: Wed, 23 Nov 2011 16:09:08 +0000 (+0800)
Subject: * src/window.c (Fcoordinates_in_window_p): Accept only live windows.
X-Git-Tag: emacs-pretest-24.0.92~69
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=90ec88df9f36d19547d287526f71cc27d76ccabb;p=emacs.git

* src/window.c (Fcoordinates_in_window_p): Accept only live windows.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 694478e2d39..42e54c41dff 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-23  Chong Yidong  <cyd@gnu.org>
+
+	* window.c (Fcoordinates_in_window_p): Accept only live windows.
+
 2011-11-23  Martin Rudalics  <rudalics@gmx.at>
 
 	* buffer.c (Fkill_buffer): Run replace_buffer_in_windows before
diff --git a/src/window.c b/src/window.c
index dd354b0ceea..bb2478d78fd 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1052,6 +1052,7 @@ window_relative_x_coord (struct window *w, enum window_part part, int x)
 DEFUN ("coordinates-in-window-p", Fcoordinates_in_window_p,
        Scoordinates_in_window_p, 2, 2, 0,
        doc: /* Return non-nil if COORDINATES are in WINDOW.
+WINDOW must be a live window.
 COORDINATES is a cons of the form (X . Y), X and Y being distances
 measured in characters from the upper-left corner of the frame.
 \(0 . 0) denotes the character in the upper left corner of the
@@ -1073,7 +1074,7 @@ If they are in the windows's left or right marginal areas, `left-margin'\n\
   int x, y;
   Lisp_Object lx, ly;
 
-  CHECK_WINDOW (window);
+  CHECK_LIVE_WINDOW (window);
   w = XWINDOW (window);
   f = XFRAME (w->frame);
   CHECK_CONS (coordinates);