--- scrollbar-carbon.c.old Wed Feb 9 11:22:07 2005 +++ scrollbar-carbon.c Fri Apr 29 10:10:52 2005 @@ -274,12 +274,8 @@ static void carbon_release_scrollbar_instance (struct scrollbar_instance *sb) { - Lisp_Object win = real_window (sb->mirror, 1); - if (NILP (win)) - return; - - Lisp_Object frame = WINDOW_FRAME (XWINDOW (win)); - + Lisp_Object frame = sb->mirror->frame; + /* Carbon doesn't allow moves/visibility changes of scrollbars in non-compositing windows when a CG context is open. This kludge lets carbon_frame_output_end in redisplay-carbon.c know it should queue a misc user event containing a Lisp redraw-frame call. */ if (FRAME_CARBON_NESTEDNESS (XFRAME (frame)) > 0) {