diff options
| author | Jim Blandy | 1993-05-16 00:23:33 +0000 |
|---|---|---|
| committer | Jim Blandy | 1993-05-16 00:23:33 +0000 |
| commit | 32dc08666b5b8448113be6d4425885cd37c5d974 (patch) | |
| tree | fc22c49196ec2ae5b3f6ea20992d109a47791b77 /src | |
| parent | 3dbc7e323668ef778206e8488b41e0c1c2df6bab (diff) | |
| download | emacs-32dc08666b5b8448113be6d4425885cd37c5d974.tar.gz emacs-32dc08666b5b8448113be6d4425885cd37c5d974.zip | |
* xfaces.c (unload_color): Don't try to unload the standard black
or white pixel.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfaces.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index e037d703812..225e9939445 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -406,7 +406,9 @@ unload_color (f, pixel) | |||
| 406 | { | 406 | { |
| 407 | Colormap cmap; | 407 | Colormap cmap; |
| 408 | Display *dpy = x_current_display; | 408 | Display *dpy = x_current_display; |
| 409 | if (pixel == FACE_DEFAULT) | 409 | if (pixel == FACE_DEFAULT |
| 410 | || pixel == BLACK_PIX_DEFAULT | ||
| 411 | || pixel == WHITE_PIX_DEFAULT) | ||
| 410 | return; | 412 | return; |
| 411 | cmap = DefaultColormapOfScreen (DefaultScreenOfDisplay (x_current_display)); | 413 | cmap = DefaultColormapOfScreen (DefaultScreenOfDisplay (x_current_display)); |
| 412 | BLOCK_INPUT; | 414 | BLOCK_INPUT; |