diff options
| author | Paul Eggert | 2011-06-18 18:35:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-06-18 18:35:03 -0700 |
| commit | f14ed477b81a165cd731aa1d851a1cc0247d70b8 (patch) | |
| tree | f648ebbb9486067a46c09437a40ff7c7f8a8ac00 /src | |
| parent | e4d29b3382b1a6f3b09e9d5d073493e909540593 (diff) | |
| download | emacs-f14ed477b81a165cd731aa1d851a1cc0247d70b8.tar.gz emacs-f14ed477b81a165cd731aa1d851a1cc0247d70b8.zip | |
* lread.c (string_to_number): Simplify the 2011-04-26 change by invoking xsignal1.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/lread.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2016669efc1..c5cb08237de 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | All uses changed. This doesn't fix a bug, but it simplifies the | 4 | All uses changed. This doesn't fix a bug, but it simplifies the |
| 5 | code away from its former Hollerith-constant appearance, and it's | 5 | code away from its former Hollerith-constant appearance, and it's |
| 6 | one less 'int' to worry about when looking at integer-overflow issues. | 6 | one less 'int' to worry about when looking at integer-overflow issues. |
| 7 | (string_to_number): Simplify the 2011-04-26 change by invoking xsignal1. | ||
| 7 | 8 | ||
| 8 | * lisp.h (DEFUN): Remove bogus use of sizeof (struct Lisp_Subr). | 9 | * lisp.h (DEFUN): Remove bogus use of sizeof (struct Lisp_Subr). |
| 9 | This didn't break anything, but it didn't help either. | 10 | This didn't break anything, but it didn't help either. |
diff --git a/src/lread.c b/src/lread.c index f8db6c14192..5f8d6b84c3c 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -3333,7 +3333,7 @@ string_to_number (char const *string, int base, int ignore_trailing) | |||
| 3333 | /* Unfortunately there's no simple and accurate way to convert | 3333 | /* Unfortunately there's no simple and accurate way to convert |
| 3334 | non-base-10 numbers that are out of C-language range. */ | 3334 | non-base-10 numbers that are out of C-language range. */ |
| 3335 | if (base != 10) | 3335 | if (base != 10) |
| 3336 | xsignal (Qoverflow_error, list1 (build_string (string))); | 3336 | xsignal1 (Qoverflow_error, build_string (string)); |
| 3337 | } | 3337 | } |
| 3338 | else if (n <= (negative ? -MOST_NEGATIVE_FIXNUM : MOST_POSITIVE_FIXNUM)) | 3338 | else if (n <= (negative ? -MOST_NEGATIVE_FIXNUM : MOST_POSITIVE_FIXNUM)) |
| 3339 | { | 3339 | { |