Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 300-313)

   - Update from CVS
   - Update from CVS: lispref/display.texi (Forcing Redisplay): Fix typo.
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 105-106)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-74

1 files changed, 18 insertions, 6 deletions

diff --git a/src/window.c b/src/window.c
index 59c223b4a8f..6a1edb24efb 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4279,15 +4279,17 @@ adjust_window_trailing_edge (window, delta, horiz_flag)
     {
       Lisp_Object first_parallel = Qnil;
 
-      p = XWINDOW (window);
-      parent = p->parent;
-
-      if (NILP (XWINDOW (window)->next))
+      if (NILP (window))
         {
+          /* This can happen if WINDOW on the previous iteration was
+             at top level of the tree and we did not exit.  */
           Fset_window_configuration (old_config);
-          error ("No other window following this one");
+          error ("Specified window edge is fixed");
         }
 
+      p = XWINDOW (window);
+      parent = p->parent;
+
       /* See if this level has windows in parallel in the specified
          direction.  If so, set FIRST_PARALLEL to the first one.  */
       if (horiz_flag)
@@ -4301,6 +4303,14 @@ adjust_window_trailing_edge (window, delta, horiz_flag)
             first_parallel = XWINDOW (parent)->hchild;
         }
 
+      /* If this level's succession is in the desired dimension,
+         and this window is the last one, its trailing edge is fixed.  */
+      if (NILP (XWINDOW (window)->next) && NILP (first_parallel))
+        {
+          Fset_window_configuration (old_config);
+          error ("Specified window edge is fixed");
+        }
+
       /* Don't make this window too small.  */
       if (XINT (CURSIZE (window)) + delta
           < (horiz_flag ? window_min_width : window_min_height))
@@ -4324,7 +4334,7 @@ adjust_window_trailing_edge (window, delta, horiz_flag)
          we will fail and report an error, above.)  */
       if (NILP (first_parallel))
         {
-          if (!NILP (XWINDOW (window)->next))
+          if (!NILP (p->next))
             {
               /* This may happen for the minibuffer.  In that case
                  the window_deletion_count check below does not work.  */
@@ -4895,6 +4905,8 @@ window_scroll_pixel_based (window, n, whole, noerror)
             }
           else if (noerror)
             return;
+          else if (n < 0)       /* could happen with empty buffers */
+            Fsignal (Qbeginning_of_buffer, Qnil);
           else
             Fsignal (Qend_of_buffer, Qnil);
         }