upstream i think

1 files changed, 4 insertions, 3 deletions

diff --git a/src/window.c b/src/window.c
index 728e811f304..86fcca25f2e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1054,6 +1054,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
@@ -1075,7 +1076,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);
@@ -3089,7 +3090,7 @@ This function runs `window-scroll-functions' before running
             error ("Window is dedicated to `%s'", SDATA (BVAR (XBUFFER (tem), name)));
           else
             /* WINDOW is weakly dedicated to its buffer, reset
-               dedicatedness.  */
+               dedication.  */
             w->dedicated = Qnil;
 
           call1 (Qrecord_window_buffer, window);
@@ -6303,7 +6304,7 @@ freeze_window_starts (struct frame *f, int freeze_p)
    ignore_positions non-zero means ignore non-matching scroll positions
    and the like.
 
-   This ignores a couple of things like the dedicatedness status of
+   This ignores a couple of things like the dedication status of
    window, combination_limit and the like.  This might have to be
    fixed.  */