diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-05-17 18:05:02 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-05-17 18:05:02 +0000 |
| commit | 9f97e26d01003a17b861505d535c89ad73799b7e (patch) | |
| tree | 5855a1dedaf55418a1e2b867d5813853287cf474 /src/lread.c | |
| parent | 8dadeb1e1f78c7be07db5ae78aa9eed58d272a4e (diff) | |
| parent | 8d1bec8de1c570475c1332d1305bea21ffda44f1 (diff) | |
| download | emacs-9f97e26d01003a17b861505d535c89ad73799b7e.tar.gz | |
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
Diffstat (limited to 'src/lread.c')
| -rw-r--r-- | src/lread.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lread.c b/src/lread.c index d0442d38fda..8d0d6b098c0 100644 --- a/src/lread.c +++ b/src/lread.c @@ -1342,7 +1342,9 @@ end_of_file_error () /* UNIBYTE specifies how to set load_convert_to_unibyte for this invocation. READFUN, if non-nil, is used instead of `read'. - START, END is region in current buffer (from eval-region). */ + + START, END specify region to read in current buffer (from eval-region). + If the input is not from a buffer, they must be nil. */ static void readevalloop (readcharfun, stream, sourcename, evalfun, @@ -1378,6 +1380,10 @@ readevalloop (readcharfun, stream, sourcename, evalfun, else if (MARKERP (readcharfun)) b = XMARKER (readcharfun)->buffer; + /* We assume START is nil when input is not from a buffer. */ + if (! NILP (start) && !b) + abort (); + specbind (Qstandard_input, readcharfun); /* GCPROs readcharfun. */ specbind (Qcurrent_load_list, Qnil); record_unwind_protect (readevalloop_1, load_convert_to_unibyte ? Qt : Qnil); |