Merge from emacs--devo--0

[gnu-emacs] / src / fringe.c

diff --git a/src/fringe.c b/src/fringe.c
index 2fb88ce01e822806dd3adb2b8757c444c6c52f87..a39e729cfde967c86bccea582519e387302e7f21 100644 (file)
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -1705,6 +1705,7 @@ mac_init_fringe ()
 #endif
 {
   int bt;
+  struct redisplay_interface *rif = FRAME_RIF (SELECTED_FRAME ());
 
   if (!rif)
     return;
@@ -1723,6 +1724,7 @@ w32_reset_fringes ()
 {
   /* Destroy row bitmaps.  */
   int bt;
+  struct redisplay_interface *rif = FRAME_RIF (SELECTED_FRAME ());
 
   if (!rif)
     return;