Merged from miles@gnu.org--gnu-2005 (patch 659-663)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-659
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-660
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-661
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-662
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-663
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-445

2 files changed, 29 insertions, 11 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 12fb6e42460..64c676d759f 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-27  Richard M. Stallman  <rms@gnu.org>
+
+        * windows.texi (Resizing Windows): Add adjust-window-trailing-edge.
+
 2005-11-21  Juri Linkov  <juri@jurta.org>
 
         * customize.texi (Common Keywords): Update links types
diff --git a/lispref/windows.texi b/lispref/windows.texi
index 56ec80b9a24..efb7cf32326 100644
--- a/lispref/windows.texi
+++ b/lispref/windows.texi
@@ -1216,6 +1216,9 @@ forms.  But that value is hard to find.
 @defun set-window-point window position
 This function positions point in @var{window} at position
 @var{position} in @var{window}'s buffer.  It returns @var{position}.
+
+If @var{window} is selected, and its buffer is current,
+this simply does @code{goto-char}.
 @end defun
 
 @node Window Start
@@ -1702,7 +1705,7 @@ scrolling value explicitly.  The value you specify serves as a lower
 bound for automatic scrolling, i.e. automatic scrolling will not
 scroll a window to a column less than the specified one.
 
-@deffn Command scroll-left &optional count
+@deffn Command scroll-left &optional count set-minimum
 This function scrolls the selected window @var{count} columns to the
 left (or to the right if @var{count} is negative).  The default
 for @var{count} is the window width, minus 2.
@@ -1710,20 +1713,23 @@ for @var{count} is the window width, minus 2.
 The return value is the total amount of leftward horizontal scrolling in
 effect after the change---just like the value returned by
 @code{window-hscroll} (below).
-@end deffn
-
-@deffn Command scroll-right &optional count
-This function scrolls the selected window @var{count} columns to the
-right (or to the left if @var{count} is negative).  The default
-for @var{count} is the window width, minus 2.
-
-The return value is the total amount of leftward horizontal scrolling in
-effect after the change---just like the value returned by
-@code{window-hscroll} (below).
 
 Once you scroll a window as far right as it can go, back to its normal
 position where the total leftward scrolling is zero, attempts to scroll
 any farther right have no effect.
+
+If @var{set-minimum} is non-@code{nil}, the new scroll amount becomes
+the lower bound for automatic scrolling; that is, automatic scrolling
+will not scroll a window to a column less than the value returned by
+this function.  Interactive calls pass non-@code{nil} for
+@var{set-minimum}.
+@end deffn
+
+@deffn Command scroll-right &optional count set-minimum
+This function scrolls the selected window @var{count} columns to the
+right (or to the left if @var{count} is negative).  The default
+for @var{count} is the window width, minus 2.  Aside from the direction
+of scrolling, this works just like @code{scroll-left}.
 @end deffn
 
 @defun window-hscroll &optional window
@@ -2032,6 +2038,14 @@ It could be defined as follows:
 @end example
 @end deffn
 
+@defun adjust-window-trailing-edge window delta horizontal
+This function makes the selected window @var{delta} lines taller or
+@var{delta} columns wider, by moving the bottom or right edge.  This
+function does not delete other windows; if it cannot make the
+requested size adjustment, it signals an error.  On success, this
+function returns @code{nil}.
+@end defun
+
 @defun fit-window-to-buffer &optional window max-height min-height
 This function makes @var{window} the right height to display its
 contents exactly.  If @var{window} is omitted or @code{nil}, it uses