aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Kangas2023-03-05 06:30:15 +0100
committerStefan Kangas2023-03-05 06:30:15 +0100
commit6fb8a4dff7ef22f96ebe1a775240617aabac6526 (patch)
treeb89b588cd0d76d698ffbc1e7556f28d31b7a45ce /src
parent4b3ccf3092eaf5573b0f4968ee9a4515d04fd061 (diff)
parent836044f329a0a96810f2d88471cb040b9d373cce (diff)
downloademacs-6fb8a4dff7ef22f96ebe1a775240617aabac6526.tar.gz
emacs-6fb8a4dff7ef22f96ebe1a775240617aabac6526.zip
Merge from origin/emacs-29
836044f329a Fix c-ts-mode preproc directive indentation 64980a59b65 ; * lisp/files.el (hack-local-variables): Fix typo in the... a7cd125d490 More robustly unspoof HOME in Eglot tests (bug#61637) 6c66dbd02c7 Turn on Eglot inlay hints by default 246f5b541c5 Update ts modes missed in 4c16fd3a512 to use column-0 0bfba49ca7c Robustify Eglot for "transient" projects ea5fd375bb2 Fix documentation of 'normal-mode' in buffers that don't ... 4c16fd3a512 Change tree-sitter indent anchor 'point-min' to 'column-0' f47b3930158 Fix go-ts-mode multi-line string indentation (bug#61923) e0bf2da3db6 ; More accurate doc strings for 'window-at' and 'window-a...
Diffstat (limited to 'src')
-rw-r--r--src/window.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/window.c b/src/window.c
index bf89261e79c..f4e09f49eae 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);