diff options
| author | Eli Zaretskii | 2013-04-05 16:10:57 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2013-04-05 16:10:57 +0300 |
| commit | eb1dd42a729ab1b9cdcd278767951679480cd4c3 (patch) | |
| tree | 7a9787eacf9fa495ad8f7caef59bb58a46fbe04a /src/data.c | |
| parent | 86e9346005b957ddadb73586c9641e68ea12a79d (diff) | |
| parent | 2a417372c4a06fe90c343bc59660268c7a5ac3e9 (diff) | |
| download | emacs-eb1dd42a729ab1b9cdcd278767951679480cd4c3.tar.gz emacs-eb1dd42a729ab1b9cdcd278767951679480cd4c3.zip | |
Merge from trunk.
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 b20d1b4c8af..6622088b648 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 = XINT (c) >= 0; | 2340 | valid = 0 <= XINT (c); |
| 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 (d >= 0 | 2346 | if (0 <= d |
| 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; |