diff options
| author | Paul Eggert | 2013-06-30 08:24:14 -0700 |
|---|---|---|
| committer | Paul Eggert | 2013-06-30 08:24:14 -0700 |
| commit | 8f5f35ccca84dd9d518bae3bb7ff4134d603b96f (patch) | |
| tree | a1a003ef6fb5c2875275b76cb04d8688bca92b42 /src/xterm.c | |
| parent | e6c6c8c7748471aec72f2e98ade5416e19a20e61 (diff) | |
| download | emacs-8f5f35ccca84dd9d518bae3bb7ff4134d603b96f.tar.gz emacs-8f5f35ccca84dd9d518bae3bb7ff4134d603b96f.zip | |
Do not use GTK 3 if it exists but cannot be compiled.
* configure.ac: Leave GTK_OBJ and term_header alone if GTK 3
exists but cannot be compiled.
* src/xmenu.c (x_menu_wait_for_event) [!USE_GTK]:
* src/xterm.c (x_error_handler) [!USE_GTK]:
Do not use GTK 3.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xterm.c b/src/xterm.c index 7505aa3936b..9c868aec392 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -7824,7 +7824,7 @@ static void x_error_quitter (Display *, XErrorEvent *); | |||
| 7824 | static int | 7824 | static int |
| 7825 | x_error_handler (Display *display, XErrorEvent *event) | 7825 | x_error_handler (Display *display, XErrorEvent *event) |
| 7826 | { | 7826 | { |
| 7827 | #ifdef HAVE_GTK3 | 7827 | #if defined USE_GTK && defined HAVE_GTK3 |
| 7828 | if (event->error_code == BadMatch | 7828 | if (event->error_code == BadMatch |
| 7829 | && event->request_code == X_SetInputFocus | 7829 | && event->request_code == X_SetInputFocus |
| 7830 | && event->minor_code == 0) | 7830 | && event->minor_code == 0) |