comparison src/minibuf.c @ 440:8de8e3f6228a r21-2-28

Import from CVS: tag r21-2-28
author cvs
date Mon, 13 Aug 2007 11:33:38 +0200
parents 3ecd8885ac67
children abe6d1db359e
comparison
equal deleted inserted replaced
439:357dd071b03c 440:8de8e3f6228a
385 } 385 }
386 else 386 else
387 { 387 {
388 if (!ZEROP (bucket)) 388 if (!ZEROP (bucket))
389 { 389 {
390 struct Lisp_Symbol *next; 390 Lisp_Symbol *next;
391 if (!SYMBOLP (bucket)) 391 if (!SYMBOLP (bucket))
392 { 392 {
393 signal_simple_error ("Bad obarray passed to try-completions", 393 signal_simple_error ("Bad obarray passed to try-completions",
394 bucket); 394 bucket);
395 } 395 }
588 } 588 }
589 else 589 else
590 { 590 {
591 if (!ZEROP (bucket)) 591 if (!ZEROP (bucket))
592 { 592 {
593 struct Lisp_Symbol *next = symbol_next (XSYMBOL (bucket)); 593 Lisp_Symbol *next = symbol_next (XSYMBOL (bucket));
594 elt = bucket; 594 elt = bucket;
595 eltstring = Fsymbol_name (elt); 595 eltstring = Fsymbol_name (elt);
596 if (next) 596 if (next)
597 XSETSYMBOL (bucket, next); 597 XSETSYMBOL (bucket, next);
598 else 598 else
680 no_restore ? Qt : Qnil); 680 no_restore ? Qt : Qnil);
681 } 681 }
682 else 682 else
683 { 683 {
684 write_string_to_stdio_stream (stderr, 0, (CONST Bufbyte *) "\n", 0, 1, 684 write_string_to_stdio_stream (stderr, 0, (CONST Bufbyte *) "\n", 0, 1,
685 FORMAT_TERMINAL); 685 Qterminal);
686 return Qnil; 686 return Qnil;
687 } 687 }
688 } 688 }
689 689
690 Lisp_Object 690 Lisp_Object
708 { 708 {
709 /* This function can call lisp */ 709 /* This function can call lisp */
710 Lisp_Object obj; 710 Lisp_Object obj;
711 struct gcpro gcpro1; 711 struct gcpro gcpro1;
712 Lisp_Object frame; 712 Lisp_Object frame;
713
714 /* There is an inlining bug in egcs-20000131 c++ that can be worked
715 around as follows: */
716 #if defined (__GNUC__) && defined (__cplusplus)
717 alloca (4);
718 #endif
713 719
714 /* some callers pass in a null string as a way of clearing the echo area. 720 /* some callers pass in a null string as a way of clearing the echo area.
715 check for length == 0 now; if this case, neither nonreloc nor reloc 721 check for length == 0 now; if this case, neither nonreloc nor reloc
716 may be valid. */ 722 may be valid. */
717 if (length == 0) 723 if (length == 0)
743 else 749 else
744 { 750 {
745 if (STRINGP (reloc)) 751 if (STRINGP (reloc))
746 nonreloc = XSTRING_DATA (reloc); 752 nonreloc = XSTRING_DATA (reloc);
747 write_string_to_stdio_stream (stderr, 0, nonreloc, offset, length, 753 write_string_to_stdio_stream (stderr, 0, nonreloc, offset, length,
748 FORMAT_TERMINAL); 754 Qterminal);
749 } 755 }
750 } 756 }
751 757
752 void 758 void
753 echo_area_message (struct frame *f, CONST Bufbyte *nonreloc, 759 echo_area_message (struct frame *f, CONST Bufbyte *nonreloc,