Mercurial > emacs

changeset 51173:b4f5f0f32f01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(display_mode_element): Increase max depth. Simplify the error handling code. Use a different error string for the case where we hit the depth limit.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 23 May 2003 23:32:55 +0000
parents 61a988cae9b2
children 26b66dee5902
files src/xdisp.c
diffstat 1 files changed, 5 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/src/xdisp.c	Fri May 23 22:38:15 2003 +0000
+++ b/src/xdisp.c	Fri May 23 23:32:55 2003 +0000
@@ -1,5 +1,5 @@
 /* Display generation from window structure and buffer text.
-   Copyright (C) 1985,86,87,88,93,94,95,97,98,99, 2000, 2001, 2002, 2003
+   Copyright (C) 1985,86,87,88,93,94,95,97,98,99,2000,01,02,03
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -14927,8 +14927,8 @@
   int literal = 0;
 
  tail_recurse:
-  if (depth > 10)
-    goto invalid;
+  if (depth > 100)
+    elt = build_string ("*too-deep*");
 
   depth++;
 
@@ -15283,14 +15283,8 @@
 
     default:
     invalid:
-      if (frame_title_ptr)
-	n += store_frame_title ("*invalid*", 0, precision - n);
-      else if (!NILP (mode_line_string_list))
-	n += store_mode_line_string ("*invalid*", Qnil, 0, 0, precision - n, Qnil);
-      else
-	n += display_string ("*invalid*", Qnil, Qnil, 0, 0, it, 0,
-			     precision - n, 0, 0);
-      return n;
+      elt = build_string ("*invalid*");
+      goto tail_recurse;
     }
 
   /* Pad to FIELD_WIDTH.  */