Mercurial > emacs

comparison src/eval.c @ 110554:e49fcbdc458f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix int/EMACS_INT in eval.c and indent.c, correct previous changes. indent.c (Fcurrent_indentation, indented_beyond_p) (compute_motion): Use EMACS_INT for buffer position variables. lisp.h (indented_beyond_p): Adjust prototype. buffer.c (overlay_strings): Return EMACS_INT. buffer.h (overlay_strings): Adjust prototype. region-cache.c (pp_cache): Adjust format to arguments. eval.c <specpdl_size, lisp_eval_depth>: Declare EMACS_INT. (call_debugger): Use EMACS_INT for specpdl_size related variables. (verror): Use EMACS_INT for size of allocated buffer.
author Eli Zaretskii <eliz@gnu.org>
date Fri, 24 Sep 2010 15:30:13 -0400
parents f7b98576d87f
children f330be51ec02
comparison
equal deleted inserted replaced
110553:eb608280bd3b 110554:e49fcbdc458f
77 77
78 Lisp_Object Vautoload_queue; 78 Lisp_Object Vautoload_queue;
79 79
80 /* Current number of specbindings allocated in specpdl. */ 80 /* Current number of specbindings allocated in specpdl. */
81 81
82 int specpdl_size; 82 EMACS_INT specpdl_size;
83 83
84 /* Pointer to beginning of specpdl. */ 84 /* Pointer to beginning of specpdl. */
85 85
86 struct specbinding *specpdl; 86 struct specbinding *specpdl;
87 87
93 93
94 EMACS_INT max_specpdl_size; 94 EMACS_INT max_specpdl_size;
95 95
96 /* Depth in Lisp evaluations and function calls. */ 96 /* Depth in Lisp evaluations and function calls. */
97 97
98 int lisp_eval_depth; 98 EMACS_INT lisp_eval_depth;
99 99
100 /* Maximum allowed depth in Lisp evaluations and function calls. */ 100 /* Maximum allowed depth in Lisp evaluations and function calls. */
101 101
102 EMACS_INT max_lisp_eval_depth; 102 EMACS_INT max_lisp_eval_depth;
103 103
214 call_debugger (Lisp_Object arg) 214 call_debugger (Lisp_Object arg)
215 { 215 {
216 int debug_while_redisplaying; 216 int debug_while_redisplaying;
217 int count = SPECPDL_INDEX (); 217 int count = SPECPDL_INDEX ();
218 Lisp_Object val; 218 Lisp_Object val;
219 int old_max = max_specpdl_size; 219 EMACS_INT old_max = max_specpdl_size;
220 220
221 /* Temporarily bump up the stack limits, 221 /* Temporarily bump up the stack limits,
222 so the debugger won't run out of stack. */ 222 so the debugger won't run out of stack. */
223 223
224 max_specpdl_size += 1; 224 max_specpdl_size += 1;
1990 /* dump an error message; called like vprintf */ 1990 /* dump an error message; called like vprintf */
1991 void 1991 void
1992 verror (const char *m, va_list ap) 1992 verror (const char *m, va_list ap)
1993 { 1993 {
1994 char buf[200]; 1994 char buf[200];
1995 int size = 200; 1995 EMACS_INT size = 200;
1996 int mlen; 1996 int mlen;
1997 char *buffer = buf; 1997 char *buffer = buf;
1998 char *args[3]; 1998 char *args[3];
1999 int allocated = 0; 1999 int allocated = 0;
2000 Lisp_Object string; 2000 Lisp_Object string;