if IGNORE_CASE is true. */
Charcount
-scmp_1 (CONST Bufbyte *s1, CONST Bufbyte *s2, Charcount len,
+scmp_1 (const Bufbyte *s1, const Bufbyte *s2, Charcount len,
int ignore_case)
{
Charcount l = len;
int
-regexp_ignore_completion_p (CONST Bufbyte *nonreloc,
+regexp_ignore_completion_p (const Bufbyte *nonreloc,
Lisp_Object reloc, Bytecount offset,
Bytecount length)
{
{
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);
+ write_string_to_stdio_stream (stderr, 0, (const Bufbyte *) "\n", 0, 1,
+ Qterminal, 0);
return Qnil;
}
}
}
void
-echo_area_append (struct frame *f, CONST Bufbyte *nonreloc, Lisp_Object reloc,
+echo_area_append (struct frame *f, const Bufbyte *nonreloc, Lisp_Object reloc,
Bytecount offset, Bytecount length,
Lisp_Object label)
{
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, 0);
}
}
void
-echo_area_message (struct frame *f, CONST Bufbyte *nonreloc,
+echo_area_message (struct frame *f, const Bufbyte *nonreloc,
Lisp_Object reloc, Bytecount offset, Bytecount length,
Lisp_Object label)
{
/* Dump an informative message to the echo area. This function takes a
string in internal format. */
void
-message_internal (CONST Bufbyte *nonreloc, Lisp_Object reloc,
+message_internal (const Bufbyte *nonreloc, Lisp_Object reloc,
Bytecount offset, Bytecount length)
{
/* This function can call lisp */
}
void
-message_append_internal (CONST Bufbyte *nonreloc, Lisp_Object reloc,
+message_append_internal (const Bufbyte *nonreloc, Lisp_Object reloc,
Bytecount offset, Bytecount length)
{
/* This function can call lisp */
on the format string; message_no_translate() does not. */
static void
-message_1 (CONST char *fmt, va_list args)
+message_1 (const char *fmt, va_list args)
{
/* This function can call lisp */
if (fmt)
struct gcpro gcpro1;
/* message_internal() might GC, e.g. if there are after-change-hooks
on the echo area buffer */
- Lisp_Object obj = emacs_doprnt_string_va ((CONST Bufbyte *) fmt, Qnil,
+ Lisp_Object obj = emacs_doprnt_string_va ((const Bufbyte *) fmt, Qnil,
-1, args);
GCPRO1 (obj);
message_internal (0, obj, 0, -1);
}
static void
-message_append_1 (CONST char *fmt, va_list args)
+message_append_1 (const char *fmt, va_list args)
{
/* This function can call lisp */
if (fmt)
struct gcpro gcpro1;
/* message_internal() might GC, e.g. if there are after-change-hooks
on the echo area buffer */
- Lisp_Object obj = emacs_doprnt_string_va ((CONST Bufbyte *) fmt, Qnil,
+ Lisp_Object obj = emacs_doprnt_string_va ((const Bufbyte *) fmt, Qnil,
-1, args);
GCPRO1 (obj);
message_append_internal (0, obj, 0, -1);
}
void
-message (CONST char *fmt, ...)
+message (const char *fmt, ...)
{
/* This function can call lisp */
/* I think it's OK to pass the data of Lisp strings as arguments to
}
void
-message_append (CONST char *fmt, ...)
+message_append (const char *fmt, ...)
{
/* This function can call lisp */
va_list args;
}
void
-message_no_translate (CONST char *fmt, ...)
+message_no_translate (const char *fmt, ...)
{
/* This function can call lisp */
/* I think it's OK to pass the data of Lisp strings as arguments to
}
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 ();
}