diff options
| author | Juanma Barranquero | 2007-02-14 15:47:51 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2007-02-14 15:47:51 +0000 |
| commit | 6c8e1d625c4b4adba5ea03f615d79b38b6a5fdd0 (patch) | |
| tree | 0a63c270235505e5db3c30287ee6a4cd7ed84b96 | |
| parent | 22bbca614f492025bb9c57ec7250447bc69c33c2 (diff) | |
| download | emacs-6c8e1d625c4b4adba5ea03f615d79b38b6a5fdd0.tar.gz emacs-6c8e1d625c4b4adba5ea03f615d79b38b6a5fdd0.zip | |
(Fcolor_distance): Don't continue checking a color for errors after it has been
correctly parsed as an RGB list.
| -rw-r--r-- | src/xfaces.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 46a95feeb45..b98d10764ce 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -5348,13 +5348,11 @@ If FRAME is unspecified or nil, the current frame is used. */) | |||
| 5348 | CHECK_LIVE_FRAME (frame); | 5348 | CHECK_LIVE_FRAME (frame); |
| 5349 | f = XFRAME (frame); | 5349 | f = XFRAME (frame); |
| 5350 | 5350 | ||
| 5351 | if ((CONSP (color1) && !parse_rgb_list (color1, &cdef1)) | 5351 | if (!(CONSP (color1) && parse_rgb_list (color1, &cdef1)) |
| 5352 | || !STRINGP (color1) | 5352 | && !(STRINGP (color1) && defined_color (f, SDATA (color1), &cdef1, 0))) |
| 5353 | || !defined_color (f, SDATA (color1), &cdef1, 0)) | ||
| 5354 | signal_error ("Invalid color", color1); | 5353 | signal_error ("Invalid color", color1); |
| 5355 | if ((CONSP (color2) && !parse_rgb_list (color2, &cdef2)) | 5354 | if (!(CONSP (color2) && parse_rgb_list (color2, &cdef2)) |
| 5356 | || !STRINGP (color2) | 5355 | && !(STRINGP (color2) && defined_color (f, SDATA (color2), &cdef2, 0))) |
| 5357 | || !defined_color (f, SDATA (color2), &cdef2, 0)) | ||
| 5358 | signal_error ("Invalid color", color2); | 5356 | signal_error ("Invalid color", color2); |
| 5359 | 5357 | ||
| 5360 | return make_number (color_distance (&cdef1, &cdef2)); | 5358 | return make_number (color_distance (&cdef1, &cdef2)); |