From: Kim F. Storm Date: Wed, 12 Jul 2006 13:19:27 +0000 (+0000) Subject: (check_obarray): Cleanup wrong_type_argument use. X-Git-Tag: emacs-pretest-22.0.90~1501 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8878319cf18327c40fcbe06899ff500991cf0b92;p=emacs.git (check_obarray): Cleanup wrong_type_argument use. --- 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, if (MARKERP (readcharfun)) { if (NILP (start)) - start = readcharfun; + start = readcharfun; } if (BUFFERP (readcharfun)) @@ -1511,7 +1511,7 @@ readevalloop (readcharfun, stream, sourcename, evalfun, first_sexp = 0; } - build_load_history (sourcename, + build_load_history (sourcename, stream || whole_buffer); UNGCPRO; @@ -3249,12 +3249,11 @@ Lisp_Object check_obarray (obarray) Lisp_Object obarray; { - while (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) + if (!VECTORP (obarray) || XVECTOR (obarray)->size == 0) { /* If Vobarray is now invalid, force it to be valid. */ if (EQ (Vobarray, obarray)) Vobarray = initial_obarray; - - obarray = wrong_type_argument (Qvectorp, obarray); + wrong_type_argument (Qvectorp, obarray); } return obarray; }