From: Jan Djärv <jan.h.d@swipnet.se>
Date: Fri, 31 Oct 2003 22:04:05 +0000 (+0000)
Subject: * xterm.c (x_term_init): For GTK part, increase x_initialized
X-Git-Tag: ttn-vms-21-2-B4~8445
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6cc8bc072cd444af7a8652db2df4944cee295e52;p=emacs.git

* xterm.c (x_term_init): For GTK part, increase x_initialized
  to check for more than one display.  Use error instead of return 0.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 05d375e5da3..88399d1ae17 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-31  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* xterm.c (x_term_init): For GTK part, increase x_initialized
+	to check for more than one display.  Use error instead of return 0.
+
 2003-10-31  Andrew Choi  <akochoi@shaw.ca>
 
 	* unexmacosx.c (unrelocate): New function (contributed by Nozomu
diff --git a/src/xterm.c b/src/xterm.c
index c686824a003..5b76ba84059 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10204,7 +10204,8 @@ x_term_init (display_name, xrm_option, resource_name)
     /* GTK 2.0 can only handle one display, GTK 2.2 can handle more
        than one, but this remains to be implemented.  */
     if (x_initialized > 1)
-      return 0;
+      error("Sorry, the GTK port can only handle one display.");
+    ++x_initialized;
 
     for (argc = 0; argc < NUM_ARGV; ++argc)
       argv[argc] = 0;