X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/bd2311318862b58d894bf84fa364d36b0b79041e..e581a4668750ed98d77f13500c983439770ec600:/src/fringe.c

diff --git a/src/fringe.c b/src/fringe.c
index 0ceffad34f..bd93b4cfce 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA.  */
 #include "dispextern.h"
 #include "buffer.h"
 #include "blockinput.h"
+#include "termhooks.h"
 
 #ifdef HAVE_WINDOW_SYSTEM
 
@@ -588,7 +589,7 @@ draw_fringe_bitmap_1 (w, row, left_p, overlay, which)
       break;
     }
 
-  rif->draw_fringe_bitmap (w, row, &p);
+  FRAME_RIF (f)->draw_fringe_bitmap (w, row, &p);
 }
 
 void
@@ -998,8 +999,9 @@ If WHICH overrides a standard fringe bitmap, the original bitmap is restored.  *
   fbp = &fringe_bitmaps[n];
   if (*fbp && (*fbp)->dynamic)
     {
-      if (rif->destroy_fringe_bitmap)
-	rif->destroy_fringe_bitmap (n);
+      /* XXX Is SELECTED_FRAME OK here? */
+      if (FRAME_RIF (SELECTED_FRAME ())->destroy_fringe_bitmap)
+	FRAME_RIF (SELECTED_FRAME ())->destroy_fringe_bitmap (n);
       xfree (*fbp);
       *fbp = NULL;
     }
@@ -1067,6 +1069,7 @@ init_fringe_bitmap (which, fb, once_p)
 
 #if defined (MAC_OS) && defined (WORDS_BIG_ENDIAN)
       unsigned short *bits = fb->bits;
+      int j;
       for (j = 0; j < fb->height; j++)
 	{
 	  unsigned short b = *bits;
@@ -1079,8 +1082,9 @@ init_fringe_bitmap (which, fb, once_p)
     {
       Fdestroy_fringe_bitmap (make_number (which));
 
-      if (rif->define_fringe_bitmap)
-	rif->define_fringe_bitmap (which, fb->bits, fb->height, fb->width);
+      /* XXX Is SELECTED_FRAME OK here? */
+      if (FRAME_RIF (SELECTED_FRAME ())->define_fringe_bitmap)
+	FRAME_RIF (SELECTED_FRAME ())->define_fringe_bitmap (which, fb->bits, fb->height, fb->width);
 
       fringe_bitmaps[which] = fb;
       if (which >= max_used_fringe_bitmap)
@@ -1165,7 +1169,7 @@ Return new bitmap number, or nil of no more free bitmap slots.  */)
   if (NILP (which))
     {
       if (max_used_fringe_bitmap < MAX_FRINGE_BITMAPS)
-	n = make_number (max_used_fringe_bitmap++);
+	n = max_used_fringe_bitmap++;
       else
 	{
 	  for (n = MAX_STANDARD_FRINGE_BITMAPS;
@@ -1198,7 +1202,7 @@ Return new bitmap number, or nil of no more free bitmap slots.  */)
     {
       for (i = 0; i < fill1 && j < fb.height; i++)
 	b[j++] = 0;
-      for (i = 0; i < h & j < fb.height; i++)
+      for (i = 0; i < h && j < fb.height; i++)
 	{
 	  Lisp_Object elt = Faref (bits, make_number (i));
 	  b[j++] = NUMBERP (elt) ? XINT (elt) : 0;