diff options
author | Karoly Lorentey <[email protected]> | 2006-07-14 05:56:32 +0000 |
---|---|---|
committer | Karoly Lorentey <[email protected]> | 2006-07-14 05:56:32 +0000 |
commit | 99715bbc447eb633e45ffa23b87284771ce3ac74 (patch) | |
tree | 3a8a53dfe3dbdd9f8e36965e9f043eae522d3c0e /src/lread.c | |
parent | 556b89447234f15d1784a23dadbfe429464463a8 (diff) | |
parent | 763bb2d43615bc3ae816422f965d76d5e1ae4bdd (diff) |
Merged from [email protected].
Patches applied:
* [email protected]/emacs--devo--0--patch-331
Update from CVS
* [email protected]/emacs--devo--0--patch-332
Update from CVS
* [email protected]/emacs--devo--0--patch-333
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-334
Update from CVS
* [email protected]/emacs--devo--0--patch-335
Add note about "link" button-class to etc/TODO
* [email protected]/emacs--devo--0--patch-336
Update from CVS
* [email protected]/emacs--devo--0--patch-337
Update from CVS
* [email protected]/emacs--devo--0--patch-338
Update from CVS
* [email protected]/emacs--devo--0--patch-339
Update from CVS
* [email protected]/emacs--devo--0--patch-340
Update from CVS
* [email protected]/emacs--devo--0--patch-341
Update from CVS
* [email protected]/emacs--devo--0--patch-342
Update from CVS
* [email protected]/emacs--devo--0--patch-343
Update from CVS
* [email protected]/emacs--devo--0--patch-344
Update from CVS
* [email protected]/emacs--devo--0--patch-345
Update from CVS
* [email protected]/emacs--devo--0--patch-346
Update from CVS
* [email protected]/emacs--devo--0--patch-347
Update from CVS
* [email protected]/emacs--devo--0--patch-348
Update for ERC 5.1.3.
* [email protected]/emacs--devo--0--patch-349
Update from CVS
* [email protected]/emacs--devo--0--patch-350
Merge from gnus--rel--5.10
* [email protected]/gnus--rel--5.10--patch-111
Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo.
* [email protected]/gnus--rel--5.10--patch-112
Update from CVS
* [email protected]/gnus--rel--5.10--patch-113
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-114
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-572
Diffstat (limited to 'src/lread.c')
-rw-r--r-- | src/lread.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/lread.c b/src/lread.c index 8789ad03e1..91825bce15 100644 --- a/src/lread.c +++ b/src/lread.c @@ -461,7 +461,7 @@ read_filtered_event (no_switch_frame, ascii_required, error_nonascii, input_method) int no_switch_frame, ascii_required, error_nonascii, input_method; { - volatile register Lisp_Object val, delayed_switch_frame; + Lisp_Object val, delayed_switch_frame; #ifdef HAVE_WINDOW_SYSTEM if (display_hourglass_p) @@ -486,7 +486,7 @@ read_filtered_event (no_switch_frame, ascii_required, error_nonascii, switch-frame events will read it and process it. */ if (no_switch_frame && EVENT_HAS_PARAMETERS (val) - && EQ (EVENT_HEAD (val), Qswitch_frame)) + && EQ (EVENT_HEAD_KIND (EVENT_HEAD (val)), Qswitch_frame)) { delayed_switch_frame = val; goto retry; @@ -1371,7 +1371,6 @@ readevalloop (readcharfun, stream, sourcename, evalfun, int count = SPECPDL_INDEX (); struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; struct buffer *b = 0; - int bpos; int continue_reading_p; /* Nonzero if reading an entire buffer. */ int whole_buffer = 0; @@ -1381,7 +1380,7 @@ readevalloop (readcharfun, stream, sourcename, evalfun, if (MARKERP (readcharfun)) { if (NILP (start)) - start = readcharfun; + start = readcharfun; } if (BUFFERP (readcharfun)) @@ -1404,8 +1403,8 @@ readevalloop (readcharfun, stream, sourcename, evalfun, /* Try to ensure sourcename is a truename, except whilst preloading. */ if (NILP (Vpurify_flag) - && !NILP (sourcename) && Ffile_name_absolute_p (sourcename) - && (!NILP (Ffboundp (Qfile_truename)))) + && !NILP (sourcename) && !NILP (Ffile_name_absolute_p (sourcename)) + && !NILP (Ffboundp (Qfile_truename))) sourcename = call1 (Qfile_truename, sourcename) ; LOADHIST_ATTACH (sourcename); @@ -1514,7 +1513,7 @@ readevalloop (readcharfun, stream, sourcename, evalfun, first_sexp = 0; } - build_load_history (sourcename, + build_load_history (sourcename, stream || whole_buffer); UNGCPRO; @@ -3252,12 +3251,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; } |