diff options
| author | Jan Djärv | 2003-10-31 22:04:05 +0000 |
|---|---|---|
| committer | Jan Djärv | 2003-10-31 22:04:05 +0000 |
| commit | 6cc8bc072cd444af7a8652db2df4944cee295e52 (patch) | |
| tree | 7692d1c9844ea5b1637b9f804f8bbb3edc767034 | |
| parent | 043131c4a79050465f9a7ca7b0d795acac470a0c (diff) | |
| download | emacs-6cc8bc072cd444af7a8652db2df4944cee295e52.tar.gz emacs-6cc8bc072cd444af7a8652db2df4944cee295e52.zip | |
* xterm.c (x_term_init): For GTK part, increase x_initialized
to check for more than one display. Use error instead of return 0.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xterm.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 05d375e5da3..88399d1ae17 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2003-10-31 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * xterm.c (x_term_init): For GTK part, increase x_initialized | ||
| 4 | to check for more than one display. Use error instead of return 0. | ||
| 5 | |||
| 1 | 2003-10-31 Andrew Choi <akochoi@shaw.ca> | 6 | 2003-10-31 Andrew Choi <akochoi@shaw.ca> |
| 2 | 7 | ||
| 3 | * unexmacosx.c (unrelocate): New function (contributed by Nozomu | 8 | * 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) | |||
| 10204 | /* GTK 2.0 can only handle one display, GTK 2.2 can handle more | 10204 | /* GTK 2.0 can only handle one display, GTK 2.2 can handle more |
| 10205 | than one, but this remains to be implemented. */ | 10205 | than one, but this remains to be implemented. */ |
| 10206 | if (x_initialized > 1) | 10206 | if (x_initialized > 1) |
| 10207 | return 0; | 10207 | error("Sorry, the GTK port can only handle one display."); |
| 10208 | ++x_initialized; | ||
| 10208 | 10209 | ||
| 10209 | for (argc = 0; argc < NUM_ARGV; ++argc) | 10210 | for (argc = 0; argc < NUM_ARGV; ++argc) |
| 10210 | argv[argc] = 0; | 10211 | argv[argc] = 0; |