summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xdisp.c8
2 files changed, 11 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 91f39fdea57..09967b68d3f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-10 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * xdisp.c (display_mode_element): Move list length limit from 50 to
+ 5000 (see thread starting with <xbaik5174uqu.fsf@cam.ac.uk>).
+
2009-09-09 Stefan Monnier <monnier@iro.umontreal.ca>
* nsfont.m (ns_get_family): Don't force first letter to uppercase.
diff --git a/src/xdisp.c b/src/xdisp.c
index f67081a959d..9108ab6bf72 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17750,8 +17750,12 @@ display_mode_element (it, depth, field_width, precision, elt, props, risky)
}
else if (STRINGP (car) || CONSP (car))
{
- register int limit = 50;
- /* Limit is to protect against circular lists. */
+ register int limit = 5000;
+ /* Limit is to protect against circular lists.
+ The limit used to be 50, but if you use enough minor modes,
+ minor-mode-alist will easily grow past 50. Circular lists
+ are rather unlikely, so it's better for the limit to be
+ "too large" rather than "too small". */
while (CONSP (elt)
&& --limit > 0
&& (precision <= 0 || n < precision))