Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-216
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-217
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-218
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-219
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-220
   Improve tq.el.

 * emacs@sv.gnu.org/emacs--devo--0--patch-221
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-222
   Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6.

 * emacs@sv.gnu.org/emacs--devo--0--patch-223
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-224
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-225
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-226
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-227
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-228
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-229
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-230
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-231
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-232
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-233
   Update from CVS: lisp/progmodes/python.el (python-mode): Fix typo.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-84
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-85
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-86
   Update from CVS

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

1 files changed, 46 insertions, 17 deletions

diff --git a/src/window.c b/src/window.c
index cbfc7e02401..61b85e5ad22 100644
--- a/src/window.c
+++ b/src/window.c
@@ -663,12 +663,24 @@ coordinates_in_window (w, x, y)
           || WINDOW_RIGHTMOST_P (w))
         {
           if (!WINDOW_LEFTMOST_P (w) && abs (*x - x0) < grabbable_width)
-            return ON_VERTICAL_BORDER;
+            {
+              /* Convert X and Y to window relative coordinates.
+                 Vertical border is at the left edge of window.  */
+              *x = max (0, *x - x0);
+              *y -= top_y;
+              return ON_VERTICAL_BORDER;
+            }
         }
       else
         {
           if (abs (*x - x1) < grabbable_width)
-            return ON_VERTICAL_BORDER;
+            {
+              /* Convert X and Y to window relative coordinates.
+                 Vertical border is at the right edge of window.  */
+              *x = min (x1, *x) - x0;
+              *y -= top_y;
+              return ON_VERTICAL_BORDER;
+            }
         }
 
       if (*x < x0 || *x >= x1)
@@ -710,7 +722,13 @@ coordinates_in_window (w, x, y)
           && !WINDOW_HAS_VERTICAL_SCROLL_BAR (w)
           && !WINDOW_RIGHTMOST_P (w)
           && (abs (*x - right_x) < grabbable_width))
-        return ON_VERTICAL_BORDER;
+        {
+          /* Convert X and Y to window relative coordinates.
+             Vertical border is at the right edge of window.  */
+          *x = min (right_x, *x) - left_x;
+          *y -= top_y;
+          return ON_VERTICAL_BORDER;
+        }
     }
   else
     {
@@ -722,6 +740,8 @@ coordinates_in_window (w, x, y)
         {
           /* On the border on the right side of the window?  Assume that
              this area begins at RIGHT_X minus a canonical char width.  */
+          *x = min (right_x, *x) - left_x;
+          *y -= top_y;
           return ON_VERTICAL_BORDER;
         }
     }
@@ -2015,7 +2035,7 @@ window_loop (type, obj, mini, frames)
                `obj & 1' means consider only full-width windows.
                `obj & 2' means consider also dedicated windows. */
             if (((XINT (obj) & 1) && !WINDOW_FULL_WIDTH_P (w))
-                || (!(XINT (obj) & 2) && EQ (w->dedicated, Qt))
+                || (!(XINT (obj) & 2) && !NILP (w->dedicated))
                 /* Minibuffer windows are always ignored.  */
                 || MINI_WINDOW_P (w))
               break;
@@ -2070,7 +2090,7 @@ window_loop (type, obj, mini, frames)
           case GET_LARGEST_WINDOW:
             { /* nil `obj' means to ignore dedicated windows.  */
               /* Ignore dedicated windows and minibuffers.  */
-              if (MINI_WINDOW_P (w) || (NILP (obj) && EQ (w->dedicated, Qt)))
+              if (MINI_WINDOW_P (w) || (NILP (obj) && !NILP (w->dedicated)))
                 break;
 
               if (NILP (best_window))
@@ -4257,18 +4277,30 @@ adjust_window_trailing_edge (window, delta, horiz_flag)
 
   while (1)
     {
+      Lisp_Object first_parallel = Qnil;
+
       p = XWINDOW (window);
       parent = p->parent;
 
-      /* Make sure there is a following window.  */
-      if (NILP (parent)
-          && (horiz_flag ? 1
-              : NILP (XWINDOW (window)->next)))
+      if (NILP (XWINDOW (window)->next))
         {
           Fset_window_configuration (old_config);
           error ("No other window following this one");
         }
 
+      /* See if this level has windows in parallel in the specified
+         direction.  If so, set FIRST_PARALLEL to the first one.  */
+      if (horiz_flag)
+        {
+          if (! NILP (parent) && !NILP (XWINDOW (parent)->vchild))
+            first_parallel = XWINDOW (parent)->vchild;
+        }
+      else
+        {
+          if (! NILP (parent) && !NILP (XWINDOW (parent)->hchild))
+            first_parallel = XWINDOW (parent)->hchild;
+        }
+
       /* Don't make this window too small.  */
       if (XINT (CURSIZE (window)) + delta
           < (horiz_flag ? window_min_width : window_min_height))
@@ -4286,12 +4318,11 @@ adjust_window_trailing_edge (window, delta, horiz_flag)
                XINT (CURSIZE (window)) + delta);
 
       /* If this window has following siblings in the desired dimension,
-         make them smaller.
+         make them smaller, and exit the loop.
+
          (If we reach the top of the tree and can never do this,
          we will fail and report an error, above.)  */
-      if (horiz_flag
-          ? !NILP (XWINDOW (parent)->hchild)
-          : !NILP (XWINDOW (parent)->vchild))
+      if (NILP (first_parallel))
         {
           if (!NILP (XWINDOW (window)->next))
             {
@@ -4313,9 +4344,7 @@ adjust_window_trailing_edge (window, delta, horiz_flag)
       else
         /* Here we have a chain of parallel siblings, in the other dimension.
            Change the size of the other siblings.  */
-        for (child = (horiz_flag
-                      ? XWINDOW (parent)->vchild
-                      : XWINDOW (parent)->hchild);
+        for (child = first_parallel;
              ! NILP (child);
              child = XWINDOW (child)->next)
           if (! EQ (child, window))
@@ -4856,7 +4885,7 @@ window_scroll_pixel_based (window, n, whole, noerror)
         {
           if (it.current_y < it.last_visible_y
               && (it.current_y + it.max_ascent + it.max_descent
-                  >= it.last_visible_y))
+                  > it.last_visible_y))
             {
               /* The last line was only partially visible, make it fully
                  visible.  */