* lread.c (Fload): Stop checking Vloads_in_progress and signal

  error as soon as a recursive load is detected.

diff --git a/src/ChangeLog b/src/ChangeLog
index 60dc389335b588debb834b69a67a2b96adb8247e..120c0929684a6d7b8f565ff9a95c81cdfd91f1ed 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-25  Juanma Barranquero  <lekktu@gmail.com>
+
+       * lread.c (Fload): Stop checking Vloads_in_progress as soon as
+       a recursive load is detected.
+
 2009-02-24  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
        * nsterm.m (ns_ring_bell): Convert rect to window coordinates

diff --git a/src/lread.c b/src/lread.c
index e5894d6d3e91aa5fde6568cd6a1fc667ae5b0949..063adba1d9ac1f98b5e4ff88ecbe4e4cd5a1e416 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -1113,14 +1113,12 @@ Return t if the file exists and loads successfully.  */)
     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 (fd >= 0)
-         emacs_close (fd);
-       signal_error ("Recursive load", Fcons (found, Vloads_in_progress));
-      }
+      if (!NILP (Fequal (found, XCAR (tem))) && (++count > 3))
+       {
+         if (fd >= 0)
+           emacs_close (fd);
+         signal_error ("Recursive load", Fcons (found, Vloads_in_progress));
+       }
     record_unwind_protect (record_load_unwind, Vloads_in_progress);
     Vloads_in_progress = Fcons (found, Vloads_in_progress);
   }