(display_mode_element): Move list length limit from 50 to

5000 (see thread starting with <xbaik5174uqu.fsf@cam.ac.uk>).

diff --git a/src/ChangeLog b/src/ChangeLog
index 91f39fdea5753cc5a74cecc98e6957b49ced511b..09967b68d3f9b49b142598b37c02720f2440c4ba 100644 (file)
--- 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 f67081a959dc6c4205992883e9e12cb94b4a11e1..9108ab6bf7225305c74ea3662a89470dc1af0944 100644 (file)
--- 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))