diff options
| author | Ken Raeburn | 2000-06-09 16:13:11 +0000 |
|---|---|---|
| committer | Ken Raeburn | 2000-06-09 16:13:11 +0000 |
| commit | 9e80b57d282aadd5d4668ab89444bec4798c55bd (patch) | |
| tree | 6a6f956df25fb914ddc1df25ec11357ae5e347b3 /src | |
| parent | 5ee42746ce5715f9be7625173ce0adeca5db6dc1 (diff) | |
| download | emacs-9e80b57d282aadd5d4668ab89444bec4798c55bd.tar.gz emacs-9e80b57d282aadd5d4668ab89444bec4798c55bd.zip | |
* xterm.c (x_connection_closed): If dpyinfo is NULL, don't try to
access the data it doesn't point to.
Diffstat (limited to 'src')
| -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 910c24e8063..1b0e6bb0452 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2000-06-09 Ken Raeburn <raeburn@gnu.org> | ||
| 2 | |||
| 3 | * xterm.c (x_connection_closed): If dpyinfo is NULL, don't try to | ||
| 4 | access the data it doesn't point to. | ||
| 5 | |||
| 1 | 2000-06-08 Gerd Moellmann <gerd@gnu.org> | 6 | 2000-06-08 Gerd Moellmann <gerd@gnu.org> |
| 2 | 7 | ||
| 3 | * xterm.c (XTread_socket) <FocusIn>: Queue a FOCUS_IN_EVENT which | 8 | * xterm.c (XTread_socket) <FocusIn>: Queue a FOCUS_IN_EVENT which |
diff --git a/src/xterm.c b/src/xterm.c index eea9b76d191..c2cc57a319d 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -10799,7 +10799,8 @@ x_connection_closed (display, error_message) | |||
| 10799 | #endif | 10799 | #endif |
| 10800 | #endif | 10800 | #endif |
| 10801 | 10801 | ||
| 10802 | dpyinfo->display = 0; | 10802 | if (dpyinfo) |
| 10803 | dpyinfo->display = 0; | ||
| 10803 | 10804 | ||
| 10804 | /* First delete frames whose mini-buffers are on frames | 10805 | /* First delete frames whose mini-buffers are on frames |
| 10805 | that are on the dead display. */ | 10806 | that are on the dead display. */ |