diff options
| author | Richard M. Stallman | 1995-02-12 01:25:14 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1995-02-12 01:25:14 +0000 |
| commit | 58387771b5b9124d0ef9e76f7efcb7594e656305 (patch) | |
| tree | 955f75a707d1c7844709b353b6918dd26584dad7 /src | |
| parent | 86e00a8a096d66c0825597998e671d27fc345467 (diff) | |
| download | emacs-58387771b5b9124d0ef9e76f7efcb7594e656305.tar.gz emacs-58387771b5b9124d0ef9e76f7efcb7594e656305.zip | |
(x_decode_color): Ignore failure from defined_color.
Diffstat (limited to 'src')
| -rw-r--r-- | src/xfns.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/xfns.c b/src/xfns.c index 37e418ecadd..993194283f7 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -1016,10 +1016,11 @@ x_decode_color (f, arg, def) | |||
| 1016 | if (FRAME_X_DISPLAY_INFO (f)->n_planes == 1) | 1016 | if (FRAME_X_DISPLAY_INFO (f)->n_planes == 1) |
| 1017 | return def; | 1017 | return def; |
| 1018 | 1018 | ||
| 1019 | if (defined_color (f, XSTRING (arg)->data, &cdef, 1)) | 1019 | /* Ignore the return value of defined_color so that |
| 1020 | return cdef.pixel; | 1020 | we use a color close to the one requested |
| 1021 | else | 1021 | if we can't get the exact request. */ |
| 1022 | Fsignal (Qundefined_color, Fcons (arg, Qnil)); | 1022 | defined_color (f, XSTRING (arg)->data, &cdef, 1); |
| 1023 | return cdef.pixel; | ||
| 1023 | } | 1024 | } |
| 1024 | 1025 | ||
| 1025 | /* Functions called only from `x_set_frame_param' | 1026 | /* Functions called only from `x_set_frame_param' |