diff options
| author | Chong Yidong <cyd@gnu.org> | 2011-11-24 00:09:08 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2011-11-24 00:09:08 +0800 |
| commit | 90ec88df9f36d19547d287526f71cc27d76ccabb (patch) | |
| tree | 33bc0db6d8f87ec05cfcf354c69b77a505cad6bd /src | |
| parent | 17fe5af5b37dc0ae74ada8cf9d972178eb29b01b (diff) | |
| download | emacs-90ec88df9f36d19547d287526f71cc27d76ccabb.tar.gz | |
* src/window.c (Fcoordinates_in_window_p): Accept only live windows.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/window.c | 3 |
2 files changed, 6 insertions, 1 deletions
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); |