Mercurial > emacs
changeset 71673:1404a22bd1f5
(readevalloop): Remove unused var `bpos'. Yet another int/Lisp_Object mixup.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 07 Jul 2006 16:16:18 +0000 |
parents | 9c4db0e8490f |
children | c64592812a59 |
files | src/ChangeLog src/lread.c |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Jul 07 16:12:51 2006 +0000 +++ b/src/ChangeLog Fri Jul 07 16:16:18 2006 +0000 @@ -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>
--- a/src/lread.c Fri Jul 07 16:12:51 2006 +0000 +++ b/src/lread.c Fri Jul 07 16:16:18 2006 +0000 @@ -1369,7 +1369,6 @@ 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 @@ /* 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);