Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
8fc45744
Commit
8fc45744
authored
Feb 25, 2009
by
Juanma Barranquero
Browse files
* lread.c (Fload): Stop checking Vloads_in_progress and signal
error as soon as a recursive load is detected.
parent
96ad1a2f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
8 deletions
+11
-8
src/ChangeLog
src/ChangeLog
+5
-0
src/lread.c
src/lread.c
+6
-8
No files found.
src/ChangeLog
View file @
8fc45744
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
...
...
src/lread.c
View file @
8fc45744
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment