diff options
| author | Andrew Innes | 2001-07-26 10:06:32 +0000 |
|---|---|---|
| committer | Andrew Innes | 2001-07-26 10:06:32 +0000 |
| commit | 8c3b00cbc782478efd4682ef12542937d7d59228 (patch) | |
| tree | 2e9b15a756f039494c3e0f14762c1545629368d7 /src | |
| parent | 8911aff342aead068564b7209066d258defcadd8 (diff) | |
| download | emacs-8c3b00cbc782478efd4682ef12542937d7d59228.tar.gz emacs-8c3b00cbc782478efd4682ef12542937d7d59228.zip | |
(x_display_list): New variable.
(w32_term_init): Set it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/w32term.c | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c08e41b8f8d..e359ccf0cb9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2001-07-26 Andrew Innes <andrewi@gnu.org> | ||
| 2 | |||
| 3 | * w32term.c (x_display_list): New variable. | ||
| 4 | (w32_term_init): Set it. | ||
| 5 | |||
| 6 | * w32term.h (x_display_list): New extern. | ||
| 7 | |||
| 1 | 2001-07-26 Gerd Moellmann <gerd@gnu.org> | 8 | 2001-07-26 Gerd Moellmann <gerd@gnu.org> |
| 2 | 9 | ||
| 3 | * xdisp.c (resize_mini_window): Give up when inhibit-redisplay | 10 | * xdisp.c (resize_mini_window): Give up when inhibit-redisplay |
diff --git a/src/w32term.c b/src/w32term.c index 2c9110f49d5..085d1e2e898 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -192,6 +192,7 @@ extern Lisp_Object Vwindow_system; | |||
| 192 | 192 | ||
| 193 | /* This is display since w32 does not support multiple ones. */ | 193 | /* This is display since w32 does not support multiple ones. */ |
| 194 | struct w32_display_info one_w32_display_info; | 194 | struct w32_display_info one_w32_display_info; |
| 195 | struct w32_display_info *x_display_list; | ||
| 195 | 196 | ||
| 196 | /* This is a list of cons cells, each of the form (NAME . FONT-LIST-CACHE), | 197 | /* This is a list of cons cells, each of the form (NAME . FONT-LIST-CACHE), |
| 197 | one for each element of w32_display_list and in the same order. | 198 | one for each element of w32_display_list and in the same order. |
| @@ -10196,6 +10197,10 @@ w32_term_init (display_name, xrm_option, resource_name) | |||
| 10196 | w32_initialize_display_info (display_name); | 10197 | w32_initialize_display_info (display_name); |
| 10197 | 10198 | ||
| 10198 | dpyinfo = &one_w32_display_info; | 10199 | dpyinfo = &one_w32_display_info; |
| 10200 | |||
| 10201 | /* Put this display on the chain. */ | ||
| 10202 | dpyinfo->next = x_display_list; | ||
| 10203 | x_display_list = dpyinfo; | ||
| 10199 | 10204 | ||
| 10200 | hdc = GetDC (GetDesktopWindow ()); | 10205 | hdc = GetDC (GetDesktopWindow ()); |
| 10201 | 10206 | ||