projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
XEmacs 21.2.28 "Hermes".
[chise/xemacs-chise.git.1]
/
src
/
minibuf.c
diff --git
a/src/minibuf.c
b/src/minibuf.c
index
16174c5
..
1af7b81
100644
(file)
--- a/
src/minibuf.c
+++ b/
src/minibuf.c
@@
-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)
@@
-682,7
+682,7
@@
clear_echo_area_internal (struct frame *f, Lisp_Object label, int from_print,
else
{
write_string_to_stdio_stream (stderr, 0, (CONST Bufbyte *) "\n", 0, 1,
else
{
write_string_to_stdio_stream (stderr, 0, (CONST Bufbyte *) "\n", 0, 1,
- FORMAT_TERMINAL);
+ Qterminal);
return Qnil;
}
}
return Qnil;
}
}
@@
-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,7
+751,7
@@
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);
}
}
}
}