--- a/src/frame.c	Mon Aug 13 11:24:10 2007 +0200
+++ b/src/frame.c	Mon Aug 13 11:25:01 2007 +0200
@@ -34,6 +34,7 @@
 #include "faces.h"
 #include "frame.h"
 #include "glyphs.h"
+#include "gutter.h"
 #include "menubar.h"
 #include "redisplay.h"
 #include "scrollbar.h"
@@ -460,12 +461,18 @@
       reset_glyph_cachels (XWINDOW (FRAME_SELECTED_WINDOW (f)));
       reset_subwindow_cachels (f);
       change_frame_size (f, f->height, f->width, 0);
+
     }
 
   MAYBE_FRAMEMETH (f, init_frame_2, (f, props));
   Fset_frame_properties (frame, props);
   MAYBE_FRAMEMETH (f, init_frame_3, (f));
 
+  /* now initialise the gutters, this won't change the frame size
+     so is ok here. */
+  if (!DEVICE_STREAM_P (d))
+    init_frame_gutters (f);
+
   /* Hallelujah, praise the lord. */
   f->init_finished = 1;
 
@@ -893,7 +900,10 @@
     {
 #ifdef HAVE_TOOLBARS
       if (!EQ (f->last_nonminibuf_window, window))
-	MARK_TOOLBAR_CHANGED;
+	{
+	  MARK_TOOLBAR_CHANGED;
+	  MARK_GUTTER_CHANGED;
+	}
 #endif
       f->last_nonminibuf_window = window;
     }
@@ -1526,6 +1536,7 @@
 #ifdef HAVE_TOOLBARS
   free_frame_toolbars (f);
 #endif
+  free_frame_gutters (f);
 
   /* This must be done before the window and window_mirror structures
      are freed.  The scrollbar information is attached to them. */