[Emacs-diffs] Changes to emacs/src/xdisp.c

[Steven Tamm]

Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.947 emacs/src/xdisp.c:1.948
*** emacs/src/xdisp.c:1.947     Mon Dec 27 15:57:53 2004
--- emacs/src/xdisp.c   Mon Dec 27 17:27:30 2004
***************
*** 21908,21927 ****
        }
      }
  
- #ifdef HAVE_CARBON
-   /* Display scroll bar for this window.  */
-   if (!NILP (w->vertical_scroll_bar))
-     {
-       /* ++KFS:
-        If this doesn't work here (maybe some header files are missing),
-        make a function in macterm.c and call it to do the job! */
-       ControlHandle ch
-       = SCROLL_BAR_CONTROL_HANDLE (XSCROLL_BAR (w->vertical_scroll_bar));
- 
-       Draw1Control (ch);
-     }
- #endif
- 
    return mouse_face_overwritten_p;
  }
  
--- 21908,21913 ----
***************
*** 21980,21995 ****
        return;
      }
  
- #ifdef HAVE_CARBON
-   /* MAC_TODO: this is a kludge, but if scroll bars are not activated
-      or deactivated here, for unknown reasons, activated scroll bars
-      are shown in deactivated frames in some instances.  */
-   if (f == FRAME_MAC_DISPLAY_INFO (f)->x_focus_frame)
-     activate_scroll_bars (f);
-   else
-     deactivate_scroll_bars (f);
- #endif
- 
    /* If basic faces haven't been realized yet, there is no point in
       trying to redraw anything.  This can happen when we get an expose
       event while Emacs is starting, e.g. by moving another window.  */
--- 21966,21971 ----