diff src/xterm.c @ 83222:ae7fab96922c

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-626 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-627 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-628 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-629 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-630 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-631 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-632 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-633 Merge from gnus--rel--5.10 * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-634 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-635 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-636 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-637 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-638 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-54 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-55 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-56 Update from CVS: Add lisp/legacy-gnus-agent.el * [e-mail]--gnu-2004/gnus--rel--5.10--patch-57 Update from CVS * [e-mail]--gnu-2004/gnus--rel--5.10--patch-58 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-262

--- a/src/xterm.c	Tue Oct 19 17:00:02 2004 +0000
+++ b/src/xterm.c	Mon Oct 25 18:17:28 2004 +0000
@@ -2819,10 +2819,6 @@
 
   XFlush (FRAME_X_DISPLAY (f));
 
-#ifdef USE_GTK
-  xg_frame_cleared (f);
-#endif
-
   UNBLOCK_INPUT;
 }
 
@@ -4865,9 +4861,7 @@
                              top,
                              left + VERTICAL_SCROLL_BAR_WIDTH_TRIM,
                              width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
-                             max (height, 1),
-                             left,
-                             width);
+                             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);
@@ -5111,18 +5105,6 @@
 
 #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)
 	{
@@ -5131,13 +5113,21 @@
 	  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 */
 	}
-#endif /* not USE_GTK */
 #else /* not USE_TOOLKIT_SCROLL_BARS */
 
       /* Clear areas not covered by the scroll bar because of
@@ -8031,11 +8021,7 @@
       if (FRAME_X_P (f) && 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;
-	    }
+          xic_free_xfontset (f);
 	}
     }