master 530ec02 3/5: Merge from origin/emacs-27

[Glenn Morris]

branch: master
commit 530ec029cd9ac084fb5a3ba2b333cb17eb93758d
Merge: 6e3bf39 b6704d5
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    Merge from origin/emacs-27
    
    b6704d58e8 ; * src/xdisp.c (Fwindow_text_pixel_size): Doc fix.
---
 src/xdisp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 536bea6..915950f 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -10567,7 +10567,7 @@ contains long lines that shall be truncated anyway.
 
 The optional argument Y-LIMIT, if non-nil, specifies the maximum Y
 coordinate beyond which the text is to be ignored; it is therefore
-also the maxcomp height that the function can return (excluding the
+also the maximum height that the function can return (excluding the
 height of the mode- or header-line, if any).  Y-LIMIT nil or omitted
 means consider all of the accessible portion of buffer text up to the
 position specified by TO.  Since calculating the text height of a