{
if (!ZEROP (bucket))
{
- struct Lisp_Symbol *next;
+ Lisp_Symbol *next;
if (!SYMBOLP (bucket))
{
signal_simple_error ("Bad obarray passed to try-completions",
{
if (!ZEROP (bucket))
{
- struct Lisp_Symbol *next = symbol_next (XSYMBOL (bucket));
+ Lisp_Symbol *next = symbol_next (XSYMBOL (bucket));
elt = bucket;
eltstring = Fsymbol_name (elt);
if (next)
else
{
write_string_to_stdio_stream (stderr, 0, (CONST Bufbyte *) "\n", 0, 1,
- FORMAT_TERMINAL);
+ Qterminal);
return Qnil;
}
}
struct gcpro gcpro1;
Lisp_Object frame;
+ /* There is an inlining bug in egcs-20000131 c++ that can be worked
+ around as follows: */
+#if defined (__GNUC__) && defined (__cplusplus)
+ alloca (4);
+#endif
+
/* some callers pass in a null string as a way of clearing the echo area.
check for length == 0 now; if this case, neither nonreloc nor reloc
may be valid. */
if (STRINGP (reloc))
nonreloc = XSTRING_DATA (reloc);
write_string_to_stdio_stream (stderr, 0, nonreloc, offset, length,
- FORMAT_TERMINAL);
+ Qterminal);
}
}
}
void
-vars_of_minibuf (void)
+reinit_vars_of_minibuf (void)
{
minibuf_level = 0;
+}
+
+void
+vars_of_minibuf (void)
+{
+ reinit_vars_of_minibuf ();
staticpro (&Vminibuf_prompt);
Vminibuf_prompt = Qnil;
}
void
-complex_vars_of_minibuf (void)
+reinit_complex_vars_of_minibuf (void)
{
/* This function can GC */
#ifdef I18N3
#endif
Vminibuffer_zero
= Fget_buffer_create
- (Fpurecopy (build_string (DEFER_GETTEXT (" *Minibuf-0*"))));
+ (build_string (DEFER_GETTEXT (" *Minibuf-0*")));
Vecho_area_buffer
= Fget_buffer_create
- (Fpurecopy (build_string (DEFER_GETTEXT (" *Echo Area*"))));
+ (build_string (DEFER_GETTEXT (" *Echo Area*")));
+}
+
+void
+complex_vars_of_minibuf (void)
+{
+ reinit_complex_vars_of_minibuf ();
}