diff options
| author | Richard M. Stallman | 1995-02-12 01:25:58 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-02-12 01:25:58 +0000 |
| commit | 1f98e9ea8b412bc79b62580ea25566dc3a806fb5 (patch) | |
| tree | e34587bb5fbe38a0fecc6705344214bd8bc3405e | |
| parent | 58387771b5b9124d0ef9e76f7efcb7594e656305 (diff) | |
| download | emacs-1f98e9ea8b412bc79b62580ea25566dc3a806fb5.tar.gz emacs-1f98e9ea8b412bc79b62580ea25566dc3a806fb5.zip | |
(load_color): Ignore failure from XAllocColor.
| -rw-r--r-- | src/xfaces.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 36c3c1ab470..2b235e0c0c3 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -360,9 +360,9 @@ load_color (f, name) | |||
| 360 | BLOCK_INPUT; | 360 | BLOCK_INPUT; |
| 361 | result = XAllocColor (dpy, cmap, &color); | 361 | result = XAllocColor (dpy, cmap, &color); |
| 362 | UNBLOCK_INPUT; | 362 | UNBLOCK_INPUT; |
| 363 | if (! result) | 363 | /* Ignore the return value of XallocColor, so that |
| 364 | Fsignal (Qerror, Fcons (build_string ("X server cannot allocate color"), | 364 | we use a color close to the one requested |
| 365 | Fcons (name, Qnil))); | 365 | if we can't get the exact request. */ |
| 366 | return (unsigned long) color.pixel; | 366 | return (unsigned long) color.pixel; |
| 367 | } | 367 | } |
| 368 | 368 | ||