aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2009-09-10 03:20:51 +0000
committerStefan Monnier2009-09-10 03:20:51 +0000
commit19f48442c84ae8c3b615d0ac834643b88c657e1c (patch)
tree930c7fdec48ccb75895f2d0889802860d8bae18b /src
parent72d83b260c2a63b300c6587c85183e42e6df2526 (diff)
downloademacs-19f48442c84ae8c3b615d0ac834643b88c657e1c.tar.gz
emacs-19f48442c84ae8c3b615d0ac834643b88c657e1c.zip
(display_mode_element): Move list length limit from 50 to
5000 (see thread starting with <xbaik5174uqu.fsf@cam.ac.uk>).
Diffstat (limited to 'src')
-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 @@
12009-09-10 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * xdisp.c (display_mode_element): Move list length limit from 50 to
4 5000 (see thread starting with <xbaik5174uqu.fsf@cam.ac.uk>).
5
12009-09-09 Stefan Monnier <monnier@iro.umontreal.ca> 62009-09-09 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * nsfont.m (ns_get_family): Don't force first letter to uppercase. 8 * 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)
17750 } 17750 }
17751 else if (STRINGP (car) || CONSP (car)) 17751 else if (STRINGP (car) || CONSP (car))
17752 { 17752 {
17753 register int limit = 50; 17753 register int limit = 5000;
17754 /* Limit is to protect against circular lists. */ 17754 /* Limit is to protect against circular lists.
17755 The limit used to be 50, but if you use enough minor modes,
17756 minor-mode-alist will easily grow past 50. Circular lists
17757 are rather unlikely, so it's better for the limit to be
17758 "too large" rather than "too small". */
17755 while (CONSP (elt) 17759 while (CONSP (elt)
17756 && --limit > 0 17760 && --limit > 0
17757 && (precision <= 0 || n < precision)) 17761 && (precision <= 0 || n < precision))