Re-enable GTK multidisplay support.

* configure.in (HAVE_GTK_MULTIDISPLAY): Remove override.

* configure: Regenerate.

* xterm.c (x_term_init): Reword error string for GTK.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-598

1 files changed, 1 insertions, 6 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 5810eb14b20..5fb04d8103e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10566,13 +10566,8 @@ x_term_init (display_name, xrm_option, resource_name)
            than zero, we are probably on GTK 2.0, which can only handle
            one display.  GTK 2.2 or later can handle more than one.  */
         if (xg_display_open (SDATA (display_name), &dpy) < 0)
-          error ("Sorry, this version of GTK can only handle one display");
-#else
-        /* XXX Unfortunately, multiple display support is severely broken
-           in recent GTK versions, so HAVE_GTK_MULTIDISPLAY is
-           unconditionally disabled in configure.in.  */
-        error ("Sorry, multiple display support is broken in current GTK versions");
 #endif
+          error ("Sorry, this version of GTK can only handle one display");
       }
     else
       {