aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2023-03-04 10:43:25 +0200
committerEli Zaretskii2023-03-04 10:43:25 +0200
commite0bf2da3db69d074e16ceda3f2b5323f2d22d34b (patch)
tree6dbdd5189de0d5bebc6b5c7085b723eedee563db
parentbd5115e13479b1d81d6aa09efe362ad14d53c3c6 (diff)
downloademacs-e0bf2da3db69d074e16ceda3f2b5323f2d22d34b.tar.gz
emacs-e0bf2da3db69d074e16ceda3f2b5323f2d22d34b.zip
; More accurate doc strings for 'window-at' and 'window-at-x-y'.
* lisp/window.el (window-at-x-y): * src/window.c (Fwindow_at): Doc fix. (Bug#61948)
-rw-r--r--lisp/window.el4
-rw-r--r--src/window.c7
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/window.el b/lisp/window.el
index 083fa9bfd2f..f6ddae854ad 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -4134,6 +4134,10 @@ X and Y are FRAME-relative pixel coordinates. A coordinate on an
4134edge shared by two windows is attributed to the window on the 4134edge shared by two windows is attributed to the window on the
4135right (or below). Return nil if no such window can be found. 4135right (or below). Return nil if no such window can be found.
4136 4136
4137Tool-bar and tab-bar pseudo-windows are ignored by this function:
4138if the specified coordinates are in any of these two windows, this
4139function returns nil.
4140
4137Optional argument FRAME must specify a live frame and defaults to 4141Optional argument FRAME must specify a live frame and defaults to
4138the selected one. Optional argument NO-OTHER non-nil means to 4142the selected one. Optional argument NO-OTHER non-nil means to
4139return nil if the window located at the specified coordinates has 4143return nil if the window located at the specified coordinates has
diff --git a/src/window.c b/src/window.c
index a94e1d611c7..0efd6813f8d 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1729,8 +1729,11 @@ window_from_coordinates (struct frame *f, int x, int y,
1729DEFUN ("window-at", Fwindow_at, Swindow_at, 2, 3, 0, 1729DEFUN ("window-at", Fwindow_at, Swindow_at, 2, 3, 0,
1730 doc: /* Return window containing coordinates X and Y on FRAME. 1730 doc: /* Return window containing coordinates X and Y on FRAME.
1731FRAME must be a live frame and defaults to the selected one. 1731FRAME must be a live frame and defaults to the selected one.
1732The top left corner of the frame is considered to be row 0, 1732X and Y are measured in units of canonical columns and rows.
1733column 0. */) 1733The top left corner of the frame is considered to be column 0, row 0.
1734Tool-bar and tab-bar pseudo-windows are ignored by this function: if
1735the specified coordinates are in any of these two windows, this
1736function returns nil. */)
1734 (Lisp_Object x, Lisp_Object y, Lisp_Object frame) 1737 (Lisp_Object x, Lisp_Object y, Lisp_Object frame)
1735{ 1738{
1736 struct frame *f = decode_live_frame (frame); 1739 struct frame *f = decode_live_frame (frame);