Mercurial > emacs

comparison src/lread.c @ 83400:03934708f1e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from miles@gnu.org--gnu-2005 (patch 152-156, 642-654) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-642 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-643 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-644 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-645 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-646 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-647 lisp/gnus/ChangeLog: Remove duplicate entry * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-648 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-649 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-650 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-651 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-652 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-653 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-654 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-152 Update from CVS: lisp/mml.el (mml-preview): Doc fix. * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-153 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-154 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-155 Update from CVS * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-156 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-440
author Karoly Lorentey <lorentey@elte.hu>
date Fri, 18 Nov 2005 13:13:34 +0000
parents 693e794b57bf cb58edf068f2
children 39bb10ce301a
comparison
equal deleted inserted replaced
83399:2988c5a31dc1 83400:03934708f1e9
1315 Lisp_Object start, end; 1315 Lisp_Object start, end;
1316 { 1316 {
1317 register int c; 1317 register int c;
1318 register Lisp_Object val; 1318 register Lisp_Object val;
1319 int count = SPECPDL_INDEX (); 1319 int count = SPECPDL_INDEX ();
1320 struct gcpro gcpro1; 1320 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
1321 struct buffer *b = 0; 1321 struct buffer *b = 0;
1322 int continue_reading_p; 1322 int continue_reading_p;
1323 1323
1324 if (BUFFERP (readcharfun)) 1324 if (BUFFERP (readcharfun))
1325 b = XBUFFER (readcharfun); 1325 b = XBUFFER (readcharfun);
1326 else if (MARKERP (readcharfun)) 1326 else if (MARKERP (readcharfun))
1327 b = XMARKER (readcharfun)->buffer; 1327 b = XMARKER (readcharfun)->buffer;
1328 1328
1329 specbind (Qstandard_input, readcharfun); 1329 specbind (Qstandard_input, readcharfun); /* GCPROs readcharfun. */
1330 specbind (Qcurrent_load_list, Qnil); 1330 specbind (Qcurrent_load_list, Qnil);
1331 record_unwind_protect (readevalloop_1, load_convert_to_unibyte ? Qt : Qnil); 1331 record_unwind_protect (readevalloop_1, load_convert_to_unibyte ? Qt : Qnil);
1332 load_convert_to_unibyte = !NILP (unibyte); 1332 load_convert_to_unibyte = !NILP (unibyte);
1333 1333
1334 readchar_backlog = -1; 1334 readchar_backlog = -1;
1335 1335
1336 GCPRO1 (sourcename); 1336 GCPRO4 (sourcename, readfun, start, end);
1337 1337
1338 LOADHIST_ATTACH (sourcename); 1338 LOADHIST_ATTACH (sourcename);
1339 1339
1340 continue_reading_p = 1; 1340 continue_reading_p = 1;
1341 while (continue_reading_p) 1341 while (continue_reading_p)