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

[gnu-emacs] / src / lread.c

diff --git a/src/lread.c b/src/lread.c
index e6f1987a50b4d30a3feeb1567c2b6929bce16ea4..6555737fa55990a8ace97f3ce12d5fba753e060f 100644 (file)
--- 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);
        }