Mercurial > emacs
comparison src/lread.c @ 83517:b6689e223e2f
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-273
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-274
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-275
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-276
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-277
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-278
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-279
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-280
Update etc/MORE.STUFF.
* emacs@sv.gnu.org/emacs--devo--0--patch-281
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-282
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-283
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-284
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-101
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-557
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Wed, 17 May 2006 18:05:02 +0000 |
parents | 8976b9f5eda1 136d07d2859f |
children | 46b1096093f5 |
comparison
equal
deleted
inserted
replaced
83516:1321f6cfb389 | 83517:b6689e223e2f |
---|---|
1340 } | 1340 } |
1341 | 1341 |
1342 /* UNIBYTE specifies how to set load_convert_to_unibyte | 1342 /* UNIBYTE specifies how to set load_convert_to_unibyte |
1343 for this invocation. | 1343 for this invocation. |
1344 READFUN, if non-nil, is used instead of `read'. | 1344 READFUN, if non-nil, is used instead of `read'. |
1345 START, END is region in current buffer (from eval-region). */ | 1345 |
1346 START, END specify region to read in current buffer (from eval-region). | |
1347 If the input is not from a buffer, they must be nil. */ | |
1346 | 1348 |
1347 static void | 1349 static void |
1348 readevalloop (readcharfun, stream, sourcename, evalfun, | 1350 readevalloop (readcharfun, stream, sourcename, evalfun, |
1349 printflag, unibyte, readfun, start, end) | 1351 printflag, unibyte, readfun, start, end) |
1350 Lisp_Object readcharfun; | 1352 Lisp_Object readcharfun; |
1375 | 1377 |
1376 if (BUFFERP (readcharfun)) | 1378 if (BUFFERP (readcharfun)) |
1377 b = XBUFFER (readcharfun); | 1379 b = XBUFFER (readcharfun); |
1378 else if (MARKERP (readcharfun)) | 1380 else if (MARKERP (readcharfun)) |
1379 b = XMARKER (readcharfun)->buffer; | 1381 b = XMARKER (readcharfun)->buffer; |
1382 | |
1383 /* We assume START is nil when input is not from a buffer. */ | |
1384 if (! NILP (start) && !b) | |
1385 abort (); | |
1380 | 1386 |
1381 specbind (Qstandard_input, readcharfun); /* GCPROs readcharfun. */ | 1387 specbind (Qstandard_input, readcharfun); /* GCPROs readcharfun. */ |
1382 specbind (Qcurrent_load_list, Qnil); | 1388 specbind (Qcurrent_load_list, Qnil); |
1383 record_unwind_protect (readevalloop_1, load_convert_to_unibyte ? Qt : Qnil); | 1389 record_unwind_protect (readevalloop_1, load_convert_to_unibyte ? Qt : Qnil); |
1384 load_convert_to_unibyte = !NILP (unibyte); | 1390 load_convert_to_unibyte = !NILP (unibyte); |