(readevalloop): Remove unused var `bpos'. Yet another int/Lisp_Object mixup.

diff --git a/src/ChangeLog b/src/ChangeLog
index f7c171e5d444a6658061cbfd2c08ad7f2588276c..4ad5cc1171634955c4fd6773a875212c6eb7e744 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,8 @@
 
        * lread.c (read_filtered_event): Remove `register' qualifier because it
        causes compilation problem with gcc-4.0.2-20051125 on amd64.
+       (readevalloop): Remove unused var `bpos'.
+       Yet another int/Lisp_Object mixup (YAILOM).
 
 2006-07-07  Eli Zaretskii  <eliz@gnu.org>
 

diff --git a/src/lread.c b/src/lread.c
index 3cf68f6455c5ac121b56eba5f8832c4a41168e84..1cd2015cf01e0dda96f53a57cffc4fa47e0afb7d 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -1369,7 +1369,6 @@ readevalloop (readcharfun, stream, sourcename, evalfun,
   int count = SPECPDL_INDEX ();
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
   struct buffer *b = 0;
-  int bpos;
   int continue_reading_p;
   /* Nonzero if reading an entire buffer.  */
   int whole_buffer = 0;
@@ -1402,8 +1401,8 @@ readevalloop (readcharfun, stream, sourcename, evalfun,
 
   /* Try to ensure sourcename is a truename, except whilst preloading. */
   if (NILP (Vpurify_flag)
-      && !NILP (sourcename) && Ffile_name_absolute_p (sourcename)
-      && (!NILP (Ffboundp (Qfile_truename))))
+      && !NILP (sourcename) && !NILP (Ffile_name_absolute_p (sourcename))
+      && !NILP (Ffboundp (Qfile_truename)))
     sourcename = call1 (Qfile_truename, sourcename) ;
 
   LOADHIST_ATTACH (sourcename);