[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src ChangeLog lread.c
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] emacs/src ChangeLog lread.c |
Date: |
Wed, 25 Feb 2009 12:47:25 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Juanma Barranquero <lektu> 09/02/25 12:47:25
Modified files:
src : ChangeLog lread.c
Log message:
* lread.c (Fload): Stop checking Vloads_in_progress and signal
error as soon as a recursive load is detected.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7380&r2=1.7381
http://cvs.savannah.gnu.org/viewcvs/emacs/src/lread.c?cvsroot=emacs&r1=1.402&r2=1.403
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7380
retrieving revision 1.7381
diff -u -b -r1.7380 -r1.7381
--- ChangeLog 24 Feb 2009 12:44:27 -0000 1.7380
+++ ChangeLog 25 Feb 2009 12:47:23 -0000 1.7381
@@ -1,3 +1,8 @@
+2009-02-25 Juanma Barranquero <address@hidden>
+
+ * lread.c (Fload): Stop checking Vloads_in_progress as soon as
+ a recursive load is detected.
+
2009-02-24 Adrian Robert <address@hidden>
* nsterm.m (ns_ring_bell): Convert rect to window coordinates
Index: lread.c
===================================================================
RCS file: /sources/emacs/emacs/src/lread.c,v
retrieving revision 1.402
retrieving revision 1.403
diff -u -b -r1.402 -r1.403
--- lread.c 8 Jan 2009 03:15:48 -0000 1.402
+++ lread.c 25 Feb 2009 12:47:24 -0000 1.403
@@ -1113,9 +1113,7 @@
int count = 0;
Lisp_Object tem;
for (tem = Vloads_in_progress; CONSP (tem); tem = XCDR (tem))
- if (!NILP (Fequal (found, XCAR (tem))))
- count++;
- if (count > 3)
+ if (!NILP (Fequal (found, XCAR (tem))) && (++count > 3))
{
if (fd >= 0)
emacs_close (fd);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src ChangeLog lread.c,
Juanma Barranquero <=