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

[Miles Bader]

Index: emacs/src/xterm.c
diff -c emacs/src/xterm.c:1.735.2.18 emacs/src/xterm.c:1.735.2.19
*** emacs/src/xterm.c:1.735.2.18        Mon Oct 25 04:19:37 2004
--- emacs/src/xterm.c   Mon Oct 25 04:22:28 2004
***************
*** 2823,2832 ****
  
    XFlush (FRAME_X_DISPLAY (f));
  
- #ifdef USE_GTK
-   xg_frame_cleared (f);
- #endif
- 
    UNBLOCK_INPUT;
  }
  
--- 2823,2828 ----
***************
*** 4861,4869 ****
                               top,
                               left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
                               width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
!                              max (height, 1),
!                              left,
!                              width);
      xg_show_scroll_bar (SCROLL_BAR_X_WINDOW (bar));
  #else /* not USE_GTK */
      Widget scroll_bar = SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar);
--- 4857,4863 ----
                               top,
                               left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
                               width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
!                              max (height, 1));
      xg_show_scroll_bar (SCROLL_BAR_X_WINDOW (bar));
  #else /* not USE_GTK */
      Widget scroll_bar = SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar);
***************
*** 5107,5124 ****
  
  #ifdef USE_TOOLKIT_SCROLL_BARS
  
- #ifdef USE_GTK
-       if (mask)
-         xg_update_scrollbar_pos (f,
-                                  SCROLL_BAR_X_WINDOW (bar),
-                                  top,
-                                  sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
-                                  sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 
2,
-                                  max (height, 1),
-                                  left,
-                                  width);
- #else /* not USE_GTK */
- 
        /* Move/size the scroll bar widget.  */
        if (mask)
        {
--- 5101,5106 ----
***************
*** 5127,5139 ****
          if (width > 0 && height > 0)
            x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
                            left, top, width, height, False);
            XtConfigureWidget (SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar),
                               sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
                               top,
                               sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
                               max (height, 1), 0);
-       }
  #endif /* not USE_GTK */
  #else /* not USE_TOOLKIT_SCROLL_BARS */
  
        /* Clear areas not covered by the scroll bar because of
--- 5109,5129 ----
          if (width > 0 && height > 0)
            x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
                            left, top, width, height, False);
+ #ifdef USE_GTK
+           xg_update_scrollbar_pos (f,
+                                    SCROLL_BAR_X_WINDOW (bar),
+                                    top,
+                                    sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
+                                    sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM 
*2,
+                                    max (height, 1));
+ #else /* not USE_GTK */
            XtConfigureWidget (SCROLL_BAR_X_WIDGET (FRAME_X_DISPLAY (f), bar),
                               sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
                               top,
                               sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
                               max (height, 1), 0);
  #endif /* not USE_GTK */
+       }
  #else /* not USE_TOOLKIT_SCROLL_BARS */
  
        /* Clear areas not covered by the scroll bar because of
***************
*** 8022,8032 ****
        if (FRAME_X_DISPLAY_INFO (f) == dpyinfo)
        {
          FRAME_XIC (f) = NULL;
!         if (FRAME_XIC_FONTSET (f))
!           {
!             XFreeFontSet (FRAME_X_DISPLAY (f), FRAME_XIC_FONTSET (f));
!             FRAME_XIC_FONTSET (f) = NULL;
!           }
        }
      }
  
--- 8012,8018 ----
        if (FRAME_X_DISPLAY_INFO (f) == dpyinfo)
        {
          FRAME_XIC (f) = NULL;
!           xic_free_xfontset (f);
        }
      }