Merged in changes from CVS trunk.

Patches applied:

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

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

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

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


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

10 files changed, 74 insertions, 28 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 99be23b4df8..131586c4e8d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,27 @@
+2004-10-08  Steven Tamm  <steventamm@mac.com>
+
+        * config.in (HAVE_MALLOC_MALLOC_H): Regenerate
+        * macterm.c (mac_check_for_quit_char): Remove warning for using
+        NULL where 0 should be used
+        * unexmacosx.c: Use malloc/malloc.h on Tiger instead of
+        objc/malloc.h
+        * mac.c: Include time.h for Tiger compatibility
+
+2004-10-07  Kim F. Storm  <storm@cua.dk>
+
+        * xdisp.c (redisplay_window): Fix flicker on vertical line between
+        windows.  Update vertical line after drawing window fringes, but
+        only if actually drawing any bitmaps--or there is no fringe.
+
+        * xterm.c (x_update_window_end): Likewise.
+        * macterm.c (x_update_window_end): Likewise.
+        * w32term.c (x_update_window_end): Likewise.
+
+        * fringe.c (draw_window_fringes): Return value now indicates if
+        any fringe bitmaps were redrawn (or there are no fringes).
+
+        * dispextern.h (draw_window_fringes): Update prototype.
+
 2004-10-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macfns.c (mac_get_window_bounds): Add extern.
@@ -5,7 +29,7 @@
 
         * macmenu.c (update_submenu_strings): Apply 2004-09-07 change for
         xmenu.c (YAILOM).
-        
+
         * macterm.c [!MAC_OSX]: Include Windows.h.
         (front_emacs_window): Rename from mac_front_window.  All uses
         changed.  Return the frontmost non-tooltip emacs window.
diff --git a/src/config.in b/src/config.in
index 6e6d61b4e02..f2cf822b6ff 100644
--- a/src/config.in
+++ b/src/config.in
@@ -352,6 +352,9 @@ Boston, MA 02111-1307, USA.  */
 /* Define to 1 if you have the <maillock.h> header file. */
 #undef HAVE_MAILLOCK_H
 
+/* Define to 1 if you have the <malloc/malloc.h> header file. */
+#undef HAVE_MALLOC_MALLOC_H
+
 /* Define to 1 if you have the `mblen' function. */
 #undef HAVE_MBLEN
 
@@ -754,9 +757,9 @@ Boston, MA 02111-1307, USA.  */
 /* If using the C implementation of alloca, define if you know the
    direction of stack growth for your system; otherwise it will be
    automatically deduced at run-time.
-        STACK_DIRECTION > 0 => grows toward higher addresses
-        STACK_DIRECTION < 0 => grows toward lower addresses
-        STACK_DIRECTION = 0 => direction of growth unknown */
+        STACK_DIRECTION > 0 => grows toward higher addresses
+        STACK_DIRECTION < 0 => grows toward lower addresses
+        STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
 /* Define to 1 if you have the ANSI C header files. */
diff --git a/src/dispextern.h b/src/dispextern.h
index 7bf3149e1b9..ecdb760e302 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -2633,7 +2633,7 @@ extern int x_intersect_rectangles P_ ((XRectangle *, XRectangle *,
 int lookup_fringe_bitmap (Lisp_Object);
 void draw_fringe_bitmap P_ ((struct window *, struct glyph_row *, int));
 void draw_row_fringe_bitmaps P_ ((struct window *, struct glyph_row *));
-void draw_window_fringes P_ ((struct window *));
+int draw_window_fringes P_ ((struct window *, int));
 int update_window_fringes P_ ((struct window *, int));
 void compute_fringe_widths P_ ((struct frame *, int));
 
diff --git a/src/fringe.c b/src/fringe.c
index 03af487c095..e66fa4adecc 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -723,19 +723,35 @@ draw_row_fringe_bitmaps (w, row)
 }
 
 /* Draw the fringes of window W.  Only fringes for rows marked for
-   update in redraw_fringe_bitmaps_p are drawn.  */
+   update in redraw_fringe_bitmaps_p are drawn.
 
-void
-draw_window_fringes (w)
+   Return >0 if left or right fringe was redrawn in any way.
+
+   If NO_FRINGE is non-zero, also return >0 if either fringe has zero width.
+
+   A return value >0 indicates that the vertical line between windows
+   needs update (as it may be drawn in the fringe).
+*/
+
+int
+draw_window_fringes (w, no_fringe)
      struct window *w;
+     int no_fringe;
 {
   struct glyph_row *row;
   int yb = window_text_bottom_y (w);
   int nrows = w->current_matrix->nrows;
   int y = 0, rn;
+  int updated = 0;
 
   if (w->pseudo_window_p)
-    return;
+    return 0;
+
+  /* Must draw line if no fringe */
+  if (no_fringe
+      && (WINDOW_LEFT_FRINGE_WIDTH (w) == 0
+          || WINDOW_RIGHT_FRINGE_WIDTH (w) == 0))
+    updated++;
 
   for (y = 0, rn = 0, row = w->current_matrix->rows;
        y < yb && rn < nrows;
@@ -745,7 +761,10 @@ draw_window_fringes (w)
         continue;
       draw_row_fringe_bitmaps (w, row);
       row->redraw_fringe_bitmaps_p = 0;
+      updated++;
     }
+
+  return updated;
 }
 
 
@@ -951,11 +970,7 @@ update_window_fringes (w, force_p)
    Typically, we add an equal amount (+/- 1 pixel) to each fringe,
    but a negative width value is taken literally (after negating it).
 
-   We never make the fringes narrower than specified.  It is planned
-   to make fringe bitmaps customizable and expandable, and at that
-   time, the user will typically specify the minimum number of pixels
-   needed for his bitmaps, so we shouldn't select anything less than
-   what is specified.
+   We never make the fringes narrower than specified.
 */
 
 void
diff --git a/src/mac.c b/src/mac.c
index 9740b3bf3f4..f7e96b9c146 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -24,6 +24,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
 #include <errno.h>
+#include <time.h>
 #include <utime.h>
 #include <dirent.h>
 #include <sys/types.h>
diff --git a/src/macterm.c b/src/macterm.c
index 56c4653bf43..b7ebaea0990 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -1291,9 +1291,8 @@ x_update_window_end (w, cursor_on_p, mouse_face_overwritten_p)
                                 output_cursor.vpos,
                                 output_cursor.x, output_cursor.y);
 
-      x_draw_vertical_border (w);
-
-      draw_window_fringes (w);
+      if (draw_window_fringes (w, 1))
+        x_draw_vertical_border (w);
 
       UNBLOCK_INPUT;
     }
@@ -5050,7 +5049,7 @@ mac_get_window_bounds (f, inner, outer)
   GetWindowBounds (FRAME_MAC_WINDOW (f), kWindowStructureRgn, outer);
 #else /* not TARGET_API_MAC_CARBON */
   RgnHandle region = NewRgn ();
-    
+
   GetWindowRegion (FRAME_MAC_WINDOW (f), kWindowContentRgn, region);
   *inner = (*region)->rgnBBox;
   GetWindowRegion (FRAME_MAC_WINDOW (f), kWindowStructureRgn, region);
@@ -5143,7 +5142,7 @@ x_set_offset (f, xoff, yoff, change_gravity)
   {
     Rect inner, outer, screen_rect, dummy;
     RgnHandle region = NewRgn ();
-    
+
     mac_get_window_bounds (f, &inner, &outer);
     f->x_pixels_diff = inner.left - outer.left;
     f->y_pixels_diff = inner.top - outer.top;
@@ -8114,7 +8113,7 @@ XTread_socket (sd, expected, hold_quit)
         switch (GetEventClass (eventRef))
           {
           case kEventClassWindow:
-            if (GetEventKind (eventRef) == kEventWindowBoundsChanged) 
+            if (GetEventKind (eventRef) == kEventWindowBoundsChanged)
               {
                 WindowPtr window_ptr;
                 GetEventParameter(eventRef, kEventParamDirectObject,
@@ -8431,7 +8430,7 @@ XTread_socket (sd, expected, hold_quit)
 
             if (!is_emacs_window (window_ptr))
               break;
-            
+
             f = mac_window_to_frame (window_ptr);
 
             if ((er.modifiers & activeFlag) != 0)
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index b41c586d2e0..1f2b4c96620 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -99,7 +99,12 @@ Boston, MA 02111-1307, USA.  */
 #if defined (__ppc__)
 #include <mach-o/ppc/reloc.h>
 #endif
+#if defined (HAVE_MALLOC_MALLOC_H)
+#include <malloc/malloc.h>
+#else
 #include <objc/malloc.h>
+#endif
+
 
 #define VERBOSE 1
 
diff --git a/src/w32term.c b/src/w32term.c
index 7e36845eaf3..3d50e93b761 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -540,9 +540,8 @@ x_update_window_end (w, cursor_on_p, mouse_face_overwritten_p)
                                 output_cursor.vpos,
                                 output_cursor.x, output_cursor.y);
 
-      x_draw_vertical_border (w);
-
-      draw_window_fringes (w);
+      if (draw_window_fringes (w, 1))
+        x_draw_vertical_border (w);
 
       UNBLOCK_INPUT;
     }
diff --git a/src/xdisp.c b/src/xdisp.c
index 0e25b0a3de3..191e0427c66 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -12218,7 +12218,8 @@ redisplay_window (window, just_this_one_p)
     {
       update_begin (f);
       BLOCK_INPUT;
-      draw_window_fringes (w);
+      if (draw_window_fringes (w, 1))
+        x_draw_vertical_border (w);
       UNBLOCK_INPUT;
       update_end (f);
     }
diff --git a/src/xterm.c b/src/xterm.c
index 69e04de2eb8..db4914bc165 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -572,9 +572,8 @@ x_update_window_end (w, cursor_on_p, mouse_face_overwritten_p)
                                 output_cursor.vpos,
                                 output_cursor.x, output_cursor.y);
 
-      x_draw_vertical_border (w);
-
-      draw_window_fringes (w);
+      if (draw_window_fringes (w, 1))
+        x_draw_vertical_border (w);
 
       UNBLOCK_INPUT;
     }