aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-04-16 14:29:00 -0700
committerPaul Eggert2011-04-16 14:29:00 -0700
commit761383f4eca5a0c993a3703b47891f784d4b02d0 (patch)
treeb9668bdc3a677cbae4ff3235804d60dbd5226694 /src
parent875975e94dae06f2da4c1e0ad5bdc4cfd5b5f449 (diff)
downloademacs-761383f4eca5a0c993a3703b47891f784d4b02d0.tar.gz
emacs-761383f4eca5a0c993a3703b47891f784d4b02d0.zip
* xterm.c (xembed_send_message): Likewise.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/xterm.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ec43b7b2f72..906cde05086 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7,6 +7,7 @@
7 * dispextern.h (struct redisplay_interface): Rename param 7 * dispextern.h (struct redisplay_interface): Rename param
8 to avoid shadowing. 8 to avoid shadowing.
9 * termhooks.h (struct terminal): Likewise. 9 * termhooks.h (struct terminal): Likewise.
10 * xterm.c (xembed_send_message): Likewise.
10 11
11 * insdel.c (make_gap_smaller): Define only if 12 * insdel.c (make_gap_smaller): Define only if
12 USE_MMAP_FOR_BUFFERS || REL_ALLOC || DOUG_LEA_MALLOC. 13 USE_MMAP_FOR_BUFFERS || REL_ALLOC || DOUG_LEA_MALLOC.
diff --git a/src/xterm.c b/src/xterm.c
index 42aca334769..a44313d0a56 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5763,8 +5763,8 @@ event_handler_gdk (GdkXEvent *gxev, GdkEvent *ev, gpointer data)
5763#endif /* USE_GTK */ 5763#endif /* USE_GTK */
5764 5764
5765 5765
5766static void xembed_send_message (struct frame *f, Time time, 5766static void xembed_send_message (struct frame *f, Time,
5767 enum xembed_message message, 5767 enum xembed_message,
5768 long detail, long data1, long data2); 5768 long detail, long data1, long data2);
5769 5769
5770/* Handles the XEvent EVENT on display DPYINFO. 5770/* Handles the XEvent EVENT on display DPYINFO.