diff options
| author | Jan Djärv | 2012-08-15 20:34:46 +0200 |
|---|---|---|
| committer | Jan Djärv | 2012-08-15 20:34:46 +0200 |
| commit | ac4845a68bf3ee0a0b4b88c292207d9738b981bd (patch) | |
| tree | 70a1664c001f39fff49b003d30dc1236516a9fca /src | |
| parent | 5190da91e6ca41287190693a8999a6919a9cd8e6 (diff) | |
| download | emacs-ac4845a68bf3ee0a0b4b88c292207d9738b981bd.tar.gz emacs-ac4845a68bf3ee0a0b4b88c292207d9738b981bd.zip | |
* gtkutil.c (xg_mark_data): Use FRAME_X_P.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/gtkutil.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 20e5e4bdfbb..04a0df774f9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-08-15 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * gtkutil.c (xg_mark_data): Use FRAME_X_P. | ||
| 4 | |||
| 1 | 2012-08-15 Eli Zaretskii <eliz@gnu.org> | 5 | 2012-08-15 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | * region-cache.c (move_cache_gap): Update gap_len using the actual | 7 | * region-cache.c (move_cache_gap): Update gap_len using the actual |
diff --git a/src/gtkutil.c b/src/gtkutil.c index 194a1044952..6638f375a2c 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -2259,7 +2259,7 @@ xg_mark_data (void) | |||
| 2259 | { | 2259 | { |
| 2260 | FRAME_PTR f = XFRAME (frame); | 2260 | FRAME_PTR f = XFRAME (frame); |
| 2261 | 2261 | ||
| 2262 | if (FRAME_X_OUTPUT (f) && FRAME_GTK_OUTER_WIDGET (f)) | 2262 | if (FRAME_X_P (f) && FRAME_GTK_OUTER_WIDGET (f)) |
| 2263 | { | 2263 | { |
| 2264 | struct xg_frame_tb_info *tbinfo | 2264 | struct xg_frame_tb_info *tbinfo |
| 2265 | = g_object_get_data (G_OBJECT (FRAME_GTK_OUTER_WIDGET (f)), | 2265 | = g_object_get_data (G_OBJECT (FRAME_GTK_OUTER_WIDGET (f)), |