diff options
| author | Joakim Verona | 2013-03-26 16:14:01 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-03-26 16:14:01 +0100 |
| commit | 48c226c2c2592e31a47559bd1689fcc4354d9479 (patch) | |
| tree | 2f79cf5a16930fbd09d965be98b6d145c9984eb6 /src/data.c | |
| parent | e11705b616777a8a72363b2037d989987630e863 (diff) | |
| parent | 9536ec028c24fbedf617b67e98a108504e5b1e73 (diff) | |
| download | emacs-48c226c2c2592e31a47559bd1689fcc4354d9479.tar.gz emacs-48c226c2c2592e31a47559bd1689fcc4354d9479.zip | |
auto upstream
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/data.c b/src/data.c index 6622088b648..b20d1b4c8af 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -2337,13 +2337,13 @@ cons_to_unsigned (Lisp_Object c, uintmax_t max) | |||
| 2337 | uintmax_t val IF_LINT (= 0); | 2337 | uintmax_t val IF_LINT (= 0); |
| 2338 | if (INTEGERP (c)) | 2338 | if (INTEGERP (c)) |
| 2339 | { | 2339 | { |
| 2340 | valid = 0 <= XINT (c); | 2340 | valid = XINT (c) >= 0; |
| 2341 | val = XINT (c); | 2341 | val = XINT (c); |
| 2342 | } | 2342 | } |
| 2343 | else if (FLOATP (c)) | 2343 | else if (FLOATP (c)) |
| 2344 | { | 2344 | { |
| 2345 | double d = XFLOAT_DATA (c); | 2345 | double d = XFLOAT_DATA (c); |
| 2346 | if (0 <= d | 2346 | if (d >= 0 |
| 2347 | && d < (max == UINTMAX_MAX ? (double) UINTMAX_MAX + 1 : max + 1)) | 2347 | && d < (max == UINTMAX_MAX ? (double) UINTMAX_MAX + 1 : max + 1)) |
| 2348 | { | 2348 | { |
| 2349 | val = d; | 2349 | val = d; |