master cf252ef4db 5/6: Merge from origin/emacs-28

[Stefan Kangas]

branch: master
commit cf252ef4db9b5b79e12cc51c23d98fcbda81533b
Merge: eeb51e3db7 ba54f7e39c
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    ba54f7e39c ; * doc/lispref/windows.texi (Window Sizes): Another typo....
    7990d0c36a ; * doc/lispref/windows.texi (Window Sizes): Fix a typo.  ...
---
 doc/lispref/windows.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 535571b316..c7f014e2f3 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -737,7 +737,7 @@ with any other @var{round} it returns the internal value of
 @cindex window width
 @cindex width of a window
 @cindex total width of a window
-The @dfn{total width} of a window is the number of lines comprising its
+The @dfn{total width} of a window is the number of columns comprising its
 body and its left and right decorations (@pxref{Basic Windows}).
 
 @defun window-total-width &optional window round
@@ -747,7 +747,7 @@ the selected window.  If @var{window} is internal, the 
return value is
 the total width occupied by its descendant windows.
 
   If a window's pixel width is not an integral multiple of its frame's
-character width, the number of lines occupied by the window is rounded
+character width, the number of columns occupied by the window is rounded
 internally.  This is done in a way such that, if the window is a parent
 window, the sum of the total widths of all its children internally
 equals the total width of their parent.  This means that although two