[SQUASH] symbol

[bpt/emacs.git] / src / fringe.c

diff --git a/src/fringe.c b/src/fringe.c
index 1eae6b1..d70bc71 100644 (file)
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -480,9 +480,6 @@ static struct fringe_bitmap **fringe_bitmaps;
 static Lisp_Object *fringe_faces;
 static int max_fringe_bitmaps;
 
-#ifndef HAVE_NS
-static
-#endif
 int max_used_fringe_bitmap = MAX_STANDARD_FRINGE_BITMAPS;
 
 
@@ -637,7 +634,7 @@ draw_fringe_bitmap_1 (struct window *w, struct glyph_row *row, int left_p, int o
       return;
     }
 
-  PREPARE_FACE_FOR_DISPLAY (f, p.face);
+  prepare_face_for_display (f, p.face);
 
   /* Clear left fringe if no bitmap to draw or if bitmap doesn't fill
      the fringe.  */
@@ -1776,6 +1773,8 @@ Return nil if POS is not visible in WINDOW.  */)
 void
 syms_of_fringe (void)
 {
+#include "fringe.x"
+
   DEFSYM (Qtruncation, "truncation");
   DEFSYM (Qcontinuation, "continuation");
   DEFSYM (Qoverlay_arrow, "overlay-arrow");
@@ -1783,11 +1782,6 @@ syms_of_fringe (void)
   DEFSYM (Qtop_bottom, "top-bottom");
   DEFSYM (Qhollow_small, "hollow-small");
 
-  defsubr (&Sdestroy_fringe_bitmap);
-  defsubr (&Sdefine_fringe_bitmap);
-  defsubr (&Sfringe_bitmaps_at_pos);
-  defsubr (&Sset_fringe_bitmap_face);
-
   DEFVAR_LISP ("overflow-newline-into-fringe", Voverflow_newline_into_fringe,
     doc: /* Non-nil means that newline may flow into the right fringe.
 This means that display lines which are exactly as wide as the window
@@ -1802,18 +1796,6 @@ If nil, also continue lines which are exactly as wide as the window.  */);
   Vfringe_bitmaps = Qnil;
 }
 
-/* Garbage collection hook */
-
-void
-mark_fringe_data (void)
-{
-  int i;
-
-  for (i = 0; i < max_fringe_bitmaps; i++)
-    if (!NILP (fringe_faces[i]))
-      mark_object (fringe_faces[i]);
-}
-
 /* Initialize this module when Emacs starts.  */
 
 void