aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Tamm2002-11-28 07:47:34 +0000
committerSteven Tamm2002-11-28 07:47:34 +0000
commitf707342d13e34a874c3f27c5998832d5e5934501 (patch)
treeb729ba25cc8322951448017ba568171bdd19a60a /src
parentcd958eb3df20eb41e850fb2b5de1ebada921e72d (diff)
downloademacs-f707342d13e34a874c3f27c5998832d5e5934501.tar.gz
emacs-f707342d13e34a874c3f27c5998832d5e5934501.zip
fns.c (Frequire): Change nesting allowance from 2 to 3 to cause more
descriptive error output from lread.c:Fload upon most require cycles during bootstrapping
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/fns.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 030fe24435d..006422f9d9b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12002-11-27 Steven Tamm <steventamm@mac.com>
2
3 * fns.c (Frequire): Change nesting allowance from 2 to 3 to cause
4 more descriptive error output from lread.c:Fload upon most require
5 cycles during boostrapping.
6
12002-11-27 Jason Rumney <jasonr@gnu.org> 72002-11-27 Jason Rumney <jasonr@gnu.org>
2 8
3 * fileio.c (Finsert_file_contents): Give a more appropriate error 9 * fileio.c (Finsert_file_contents): Give a more appropriate error
diff --git a/src/fns.c b/src/fns.c
index c33df74b464..3774aeb9409 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -3269,7 +3269,7 @@ The normal messages at start and end of loading FILENAME are suppressed. */)
3269 nesting++; 3269 nesting++;
3270 tem = XCDR (tem); 3270 tem = XCDR (tem);
3271 } 3271 }
3272 if (nesting > 2) 3272 if (nesting > 3)
3273 error ("Recursive `require' for feature `%s'", 3273 error ("Recursive `require' for feature `%s'",
3274 SDATA (SYMBOL_NAME (feature))); 3274 SDATA (SYMBOL_NAME (feature)));
3275 3275