--- a/man/lispref/windows.texi	Mon Aug 13 10:36:50 2007 +0200
+++ b/man/lispref/windows.texi	Mon Aug 13 10:37:15 2007 +0200
@@ -431,11 +431,15 @@
 to the selected device.
 @end defun
 
-@defun select-window window
+@defun select-window window &optional norecord
 This function makes @var{window} the selected window.  The cursor then
 appears in @var{window} (on redisplay).  The buffer being displayed in
 @var{window} is immediately designated the current buffer.
 
+If optional argument @var{norecord} is non-@code{nil} then the global
+and per-frame buffer orderings are not modified, as by the function
+@code{record-buffer}. 
+
 The return value is @var{window}.
 
 @example
@@ -1568,6 +1572,29 @@
 @end example
 @end defun
 
+@defun window-text-area-pixel-height &optional window
+This function returns the height in pixels of the text displaying
+portion of @var{window}, which defaults to the selected window.  Unlike
+@code{window-pixel-height}, the space occupied by the modeline and
+horizontal scrollbar, if any, is not counted.
+@end defun
+
+@defun window-text-area-pixel-width &optional window
+This function returns the width in pixels of the text displaying
+portion of @var{window}, which defaults to the selected window.  Unlike
+@code{window-pixel-width}, the space occupied by the vertical scrollbar
+and divider, if any, is not counted.
+@end defun
+
+@defun window-displayed-text-pixel-height &optional window noclipped
+This function returns the height in pixels of the text displayed in
+@var{window}, which defaults to the selected window.  Unlike
+@code{window-text-area-pixel-height}, any blank space below the
+end of the buffer is not included.  If optional argument @var{noclipped} 
+is non-@code{nil}, any space occupied by clipped lines will not be
+included.
+@end defun
+
 @node Position of Window
 @section The Position of a Window
 @cindex window position
@@ -1614,6 +1641,14 @@
 bottom of its frame.
 @end defun
 
+@defun window-text-area-pixel-edges &optional window
+This function allows one to determine the location of the
+text-displaying portion of @var{window}, which defaults to the selected
+window, with respect to the top left corner of the window.  It returns
+a list of integer pixel positions @code{(left top right bottom)}, all
+relative to @code{(0,0)} at the top left corner of the window.
+@end defun
+
 @node Resizing Windows
 @section Changing the Size of a Window
 @cindex window resizing
@@ -1625,7 +1660,7 @@
 window size.  XEmacs does not permit overlapping windows or gaps between
 windows, so resizing one window affects other windows.
 
-@deffn Command enlarge-window size &optional horizontal
+@deffn Command enlarge-window size &optional horizontal window
 This function makes the selected window @var{size} lines taller,
 stealing lines from neighboring windows.  It takes the lines from one
 window at a time until that window is used up, then takes from another.
@@ -1646,6 +1681,9 @@
 than the minimum size (@code{window-min-height} and
 @code{window-min-width}), @code{enlarge-window} deletes the window.
 
+If @var{window} is non-@code{nil}, it specifies a window to change
+instead of the selected window.
+
 @code{enlarge-window} returns @code{nil}.  
 @end deffn
 
@@ -1669,7 +1707,7 @@
 window.
 @end deffn
 
-@deffn Command shrink-window size &optional horizontal
+@deffn Command shrink-window size &optional horizontal window
 This function is like @code{enlarge-window} but negates the argument
 @var{size}, making the selected window smaller by giving lines (or
 columns) to the other windows.  If the window shrinks below
@@ -1677,6 +1715,9 @@
 
 If @var{size} is negative, the window is enlarged by @minus{}@var{size}
 lines or columns.
+
+If @var{window} is non-@code{nil}, it specifies a window to change
+instead of the selected window.
 @end deffn
 
 @deffn Command shrink-window-horizontally columns