aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2004-10-20 16:53:27 +0000
committerJan Djärv2004-10-20 16:53:27 +0000
commit3aca2078081c657fc7937c0ae78ccd6a6449c2c6 (patch)
tree8e1ebf1062d9f6230cd1fe092493d539091dbd3d /src
parentdede27921696e4e940c93fa7335066864c93ccfd (diff)
downloademacs-3aca2078081c657fc7937c0ae78ccd6a6449c2c6.tar.gz
emacs-3aca2078081c657fc7937c0ae78ccd6a6449c2c6.zip
* xterm.h (XSync): If USE_GTK, define XSync as process_all and then
XSync.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/xterm.h4
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f1cdd38152d..1083c4b488b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12004-10-20 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 12004-10-20 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 2
3 * xterm.h (XSync): If USE_GTK, define XSync as process_all and then
4 XSync.
5
3 * emacs.c (my_heap_start, heap_bss_diff, MAX_HEAP_BSS_DIFF): 6 * emacs.c (my_heap_start, heap_bss_diff, MAX_HEAP_BSS_DIFF):
4 New variables and constant. 7 New variables and constant.
5 (main): Calculate heap_bss_diff. If we are dumping and the 8 (main): Calculate heap_bss_diff. If we are dumping and the
diff --git a/src/xterm.h b/src/xterm.h
index d3f5cee1277..f0e2f3521bb 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -50,7 +50,9 @@ typedef Widget xt_or_gtk_widget;
50typedef GtkWidget *xt_or_gtk_widget; 50typedef GtkWidget *xt_or_gtk_widget;
51#define XtParent(x) (gtk_widget_get_parent (x)) 51#define XtParent(x) (gtk_widget_get_parent (x))
52#undef XSync 52#undef XSync
53#define XSync(d, b) gdk_window_process_all_updates () 53#define XSync(d, b) do { gdk_window_process_all_updates (); \
54 XSync (d, b); } while (0)
55
54 56
55#endif /* USE_GTK */ 57#endif /* USE_GTK */
56 58