projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create branch 'XEmacs-21_4'.
[chise/xemacs-chise.git]
/
src
/
minibuf.c
diff --git
a/src/minibuf.c
b/src/minibuf.c
index
c87858d
..
0c9d560
100644
(file)
--- a/
src/minibuf.c
+++ b/
src/minibuf.c
@@
-205,7
+205,7
@@
Lowest-level interface to minibuffers. Don't call this.
if IGNORE_CASE is true. */
Charcount
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 ignore_case)
{
Charcount l = len;
@@
-244,7
+244,7
@@
scmp_1 (CONST Bufbyte *s1, CONST Bufbyte *s2, Charcount len,
int
int
-regexp_ignore_completion_p (CONST Bufbyte *nonreloc,
+regexp_ignore_completion_p (const Bufbyte *nonreloc,
Lisp_Object reloc, Bytecount offset,
Bytecount length)
{
Lisp_Object reloc, Bytecount offset,
Bytecount length)
{
@@
-387,7
+387,7
@@
The argument given to PREDICATE is the alist element or the symbol from the obar
{
if (!ZEROP (bucket))
{
{
if (!ZEROP (bucket))
{
- struct Lisp_Symbol *next;
+ Lisp_Symbol *next;
if (!SYMBOLP (bucket))
{
signal_simple_error ("Bad obarray passed to try-completions",
if (!SYMBOLP (bucket))
{
signal_simple_error ("Bad obarray passed to try-completions",
@@
-590,7
+590,7
@@
the symbol from the obarray.
{
if (!ZEROP (bucket))
{
{
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)
elt = bucket;
eltstring = Fsymbol_name (elt);
if (next)
@@
-681,8
+681,8
@@
clear_echo_area_internal (struct frame *f, Lisp_Object label, int from_print,
}
else
{
}
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;
}
}
return Qnil;
}
}
@@
-702,7
+702,7
@@
clear_echo_area_from_print (struct frame *f, Lisp_Object label, int no_restore)
}
void
}
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)
{
Bytecount offset, Bytecount length,
Lisp_Object label)
{
@@
-711,6
+711,12
@@
echo_area_append (struct frame *f, CONST Bufbyte *nonreloc, Lisp_Object reloc,
struct gcpro gcpro1;
Lisp_Object frame;
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. */
/* 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. */
@@
-745,12
+751,12
@@
echo_area_append (struct frame *f, CONST Bufbyte *nonreloc, Lisp_Object reloc,
if (STRINGP (reloc))
nonreloc = XSTRING_DATA (reloc);
write_string_to_stdio_stream (stderr, 0, nonreloc, offset, length,
if (STRINGP (reloc))
nonreloc = XSTRING_DATA (reloc);
write_string_to_stdio_stream (stderr, 0, nonreloc, offset, length,
- FORMAT_TERMINAL);
+ Qterminal, 0);
}
}
void
}
}
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)
{
Lisp_Object reloc, Bytecount offset, Bytecount length,
Lisp_Object label)
{
@@
-795,7
+801,7
@@
echo_area_contents (struct frame *f)
/* Dump an informative message to the echo area. This function takes a
string in internal format. */
void
/* 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 */
Bytecount offset, Bytecount length)
{
/* This function can call lisp */
@@
-805,7
+811,7
@@
message_internal (CONST Bufbyte *nonreloc, Lisp_Object reloc,
}
void
}
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 */
Bytecount offset, Bytecount length)
{
/* This function can call lisp */
@@
-819,7
+825,7
@@
message_append_internal (CONST Bufbyte *nonreloc, Lisp_Object reloc,
on the format string; message_no_translate() does not. */
static void
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)
{
/* This function can call lisp */
if (fmt)
@@
-827,7
+833,7
@@
message_1 (CONST char *fmt, va_list args)
struct gcpro gcpro1;
/* message_internal() might GC, e.g. if there are after-change-hooks
on the echo area buffer */
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);
-1, args);
GCPRO1 (obj);
message_internal (0, obj, 0, -1);
@@
-838,7
+844,7
@@
message_1 (CONST char *fmt, va_list args)
}
static void
}
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)
{
/* This function can call lisp */
if (fmt)
@@
-846,7
+852,7
@@
message_append_1 (CONST char *fmt, va_list args)
struct gcpro gcpro1;
/* message_internal() might GC, e.g. if there are after-change-hooks
on the echo area buffer */
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);
-1, args);
GCPRO1 (obj);
message_append_internal (0, obj, 0, -1);
@@
-864,7
+870,7
@@
clear_message (void)
}
void
}
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
{
/* This function can call lisp */
/* I think it's OK to pass the data of Lisp strings as arguments to
@@
-880,7
+886,7
@@
message (CONST char *fmt, ...)
}
void
}
void
-message_append (CONST char *fmt, ...)
+message_append (const char *fmt, ...)
{
/* This function can call lisp */
va_list args;
{
/* This function can call lisp */
va_list args;
@@
-893,7
+899,7
@@
message_append (CONST char *fmt, ...)
}
void
}
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
{
/* This function can call lisp */
/* I think it's OK to pass the data of Lisp strings as arguments to
@@
-936,9
+942,15
@@
syms_of_minibuf (void)
}
void
}
void
-vars_of_minibuf (void)
+reinit_vars_of_minibuf (void)
{
minibuf_level = 0;
{
minibuf_level = 0;
+}
+
+void
+vars_of_minibuf (void)
+{
+ reinit_vars_of_minibuf ();
staticpro (&Vminibuf_prompt);
Vminibuf_prompt = Qnil;
staticpro (&Vminibuf_prompt);
Vminibuf_prompt = Qnil;
@@
-965,7
+977,7
@@
Each completion has to match all regexps in this list.
}
void
}
void
-complex_vars_of_minibuf (void)
+reinit_complex_vars_of_minibuf (void)
{
/* This function can GC */
#ifdef I18N3
{
/* This function can GC */
#ifdef I18N3
@@
-974,8
+986,14
@@
complex_vars_of_minibuf (void)
#endif
Vminibuffer_zero
= Fget_buffer_create
#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
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 ();
}
}