Merged from miles@gnu.org--gnu-2005 (patch 681)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-681
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-469

1 files changed, 10 insertions, 0 deletions

diff --git a/src/lread.c b/src/lread.c
index e6f1987a50b..6555737fa55 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1345,10 +1345,20 @@ readevalloop (readcharfun, stream, sourcename, evalfun,
       if (b != 0 && NILP (b->name))
         error ("Reading from killed buffer");
 
+
       if (!NILP (start))
         {
+          /* Switch to the buffer we are reading from.  */
+          record_unwind_protect (save_excursion_restore, save_excursion_save ());
+          set_buffer_internal (b);
+
+          /* Save point in it.  */
           record_unwind_protect (save_excursion_restore, save_excursion_save ());
+          /* Save ZV in it.  */
           record_unwind_protect (save_restriction_restore, save_restriction_save ());
+          /* Those get unbound after we read one expression.  */
+
+          /* Set point and ZV around stuff to be read.  */
           Fgoto_char (start);
           Fnarrow_to_region (make_number (BEGV), end);
         }