diff options
| author | Kim F. Storm | 2006-07-12 13:19:27 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2006-07-12 13:19:27 +0000 |
| commit | 8878319cf18327c40fcbe06899ff500991cf0b92 (patch) | |
| tree | a748e3dfe51c8a9e48e2927ac10a92cdebb7f6ca /src | |
| parent | ce5a29a111327b37df9b73dc2a17645138afda7c (diff) | |
| download | emacs-8878319cf18327c40fcbe06899ff500991cf0b92.tar.gz emacs-8878319cf18327c40fcbe06899ff500991cf0b92.zip | |
(check_obarray): Cleanup wrong_type_argument use.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lread.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lread.c b/src/lread.c index 1cd2015cf01..3ee50e946a7 100644 --- a/src/lread.c +++ b/src/lread.c | |||
| @@ -1378,7 +1378,7 @@ readevalloop (readcharfun, stream, sourcename, evalfun, | |||
| 1378 | if (MARKERP (readcharfun)) | 1378 | if (MARKERP (readcharfun)) |
| 1379 | { | 1379 | { |
| 1380 | if (NILP (start)) | 1380 | if (NILP (start)) |
| 1381 | start = readcharfun; | 1381 | start = readcharfun; |
| 1382 | } | 1382 | } |
| 1383 | 1383 | ||
| 1384 | if (BUFFERP (readcharfun)) | 1384 | if (BUFFERP (readcharfun)) |
| @@ -1511,7 +1511,7 @@ readevalloop (readcharfun, stream, sourcename, evalfun, | |||
| 1511 | first_sexp = 0; | 1511 | first_sexp = 0; |
| 1512 | } | 1512 | } |
| 1513 | 1513 | ||
| 1514 | build_load_history (sourcename, | 1514 | build_load_history (sourcename, |
| 1515 | stream || whole_buffer); | 1515 | stream || whole_buffer); |
| 1516 | 1516 | ||
| 1517 | UNGCPRO; | 1517 | UNGCPRO; |
| @@ -3249,12 +3249,11 @@ Lisp_Object | |||
| 3249 | check_obarray (obarray) | 3249 | check_obarray (obarray) |
| 3250 | Lisp_Object obarray; | 3250 | Lisp_Object obarray; |
| 3251 | { | 3251 | { |
| 3252 | while (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) | 3252 | if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) |
| 3253 | { | 3253 | { |
| 3254 | /* If Vobarray is now invalid, force it to be valid. */ | 3254 | /* If Vobarray is now invalid, force it to be valid. */ |
| 3255 | if (EQ (Vobarray, obarray)) Vobarray = initial_obarray; | 3255 | if (EQ (Vobarray, obarray)) Vobarray = initial_obarray; |
| 3256 | 3256 | wrong_type_argument (Qvectorp, obarray); | |
| 3257 | obarray = wrong_type_argument (Qvectorp, obarray); | ||
| 3258 | } | 3257 | } |
| 3259 | return obarray; | 3258 | return obarray; |
| 3260 | } | 3259 | } |