Mercurial > hg > xemacs-beta

comparison src/minibuf.c @ 771:943eaba38521

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-03-13 08:51:24 by ben] The big ben-mule-21-5 check-in! Various files were added and deleted. See CHANGES-ben-mule. There are still some test suite failures. No crashes, though. Many of the failures have to do with problems in the test suite itself rather than in the actual code. I'll be addressing these in the next day or so -- none of the test suite failures are at all critical. Meanwhile I'll be trying to address the biggest issues -- i.e. build or run failures, which will almost certainly happen on various platforms. All comments should be sent to ben@xemacs.org -- use a Cc: if necessary when sending to mailing lists. There will be pre- and post- tags, something like pre-ben-mule-21-5-merge-in, and post-ben-mule-21-5-merge-in.
author ben
date Wed, 13 Mar 2002 08:54:06 +0000
parents fdefd0186b75
children e38acbeb1cae
comparison
equal deleted inserted replaced
770:336a418893b5 771:943eaba38521
185 minibuf_level++; 185 minibuf_level++;
186 clear_echo_area (selected_frame (), Qnil, 0); 186 clear_echo_area (selected_frame (), Qnil, 0);
187 187
188 val = call_command_loop (Qt); 188 val = call_command_loop (Qt);
189 189
190 return unbind_to (speccount, val); 190 return unbind_to_1 (speccount, val);
191 } 191 }
192 192
193 193
194 194
195 /* Completion hair */ 195 /* Completion hair */
212 212
213 if (ignore_case) 213 if (ignore_case)
214 { 214 {
215 while (l) 215 while (l)
216 { 216 {
217 Emchar c1 = DOWNCASE (current_buffer, charptr_emchar (s1)); 217 Emchar c1 = DOWNCASE (0, charptr_emchar (s1));
218 Emchar c2 = DOWNCASE (current_buffer, charptr_emchar (s2)); 218 Emchar c2 = DOWNCASE (0, charptr_emchar (s2));
219 219
220 if (c1 == c2) 220 if (c1 == c2)
221 { 221 {
222 l--; 222 l--;
223 INC_CHARPTR (s1); 223 INC_CHARPTR (s1);
686 return call4 (Qclear_message, label, frame, from_print ? Qt : Qnil, 686 return call4 (Qclear_message, label, frame, from_print ? Qt : Qnil,
687 no_restore ? Qt : Qnil); 687 no_restore ? Qt : Qnil);
688 } 688 }
689 else 689 else
690 { 690 {
691 write_string_to_stdio_stream (stderr, 0, (const Intbyte *) "\n", 0, 1, 691 stderr_out ("\n");
692 Qterminal, 0);
693 return Qnil; 692 return Qnil;
694 } 693 }
695 } 694 }
696 695
697 Lisp_Object 696 Lisp_Object
755 } 754 }
756 else 755 else
757 { 756 {
758 if (STRINGP (reloc)) 757 if (STRINGP (reloc))
759 nonreloc = XSTRING_DATA (reloc); 758 nonreloc = XSTRING_DATA (reloc);
760 write_string_to_stdio_stream (stderr, 0, nonreloc, offset, length, 759 write_string_1 (nonreloc + offset, length, Qexternal_debugging_output);
761 Qterminal, 0);
762 } 760 }
763 } 761 }
764 762
765 void 763 void
766 echo_area_message (struct frame *f, const Intbyte *nonreloc, 764 echo_area_message (struct frame *f, const Intbyte *nonreloc,
830 /* The next three functions are interfaces to message_internal() that 828 /* The next three functions are interfaces to message_internal() that
831 take strings in external format. message() does I18N3 translating 829 take strings in external format. message() does I18N3 translating
832 on the format string; message_no_translate() does not. */ 830 on the format string; message_no_translate() does not. */
833 831
834 static void 832 static void
835 message_1 (const char *fmt, va_list args) 833 message_1 (const CIntbyte *fmt, va_list args)
836 { 834 {
837 /* This function can call lisp */ 835 /* This function can call lisp */
838 if (fmt) 836 if (fmt)
839 { 837 {
840 struct gcpro gcpro1; 838 struct gcpro gcpro1;
841 /* message_internal() might GC, e.g. if there are after-change-hooks 839 /* message_internal() might GC, e.g. if there are after-change-hooks
842 on the echo area buffer */ 840 on the echo area buffer */
843 Lisp_Object obj = emacs_doprnt_string_va ((const Intbyte *) fmt, Qnil, 841 Lisp_Object obj = emacs_vsprintf_string (fmt, args);
844 -1, args);
845 GCPRO1 (obj); 842 GCPRO1 (obj);
846 message_internal (0, obj, 0, -1); 843 message_internal (0, obj, 0, -1);
847 UNGCPRO; 844 UNGCPRO;
848 } 845 }
849 else 846 else
850 message_internal (0, Qnil, 0, 0); 847 message_internal (0, Qnil, 0, 0);
851 } 848 }
852 849
853 static void 850 static void
854 message_append_1 (const char *fmt, va_list args) 851 message_append_1 (const CIntbyte *fmt, va_list args)
855 { 852 {
856 /* This function can call lisp */ 853 /* This function can call lisp */
857 if (fmt) 854 if (fmt)
858 { 855 {
859 struct gcpro gcpro1; 856 struct gcpro gcpro1;
860 /* message_internal() might GC, e.g. if there are after-change-hooks 857 /* message_internal() might GC, e.g. if there are after-change-hooks
861 on the echo area buffer */ 858 on the echo area buffer */
862 Lisp_Object obj = emacs_doprnt_string_va ((const Intbyte *) fmt, Qnil, 859 Lisp_Object obj = emacs_vsprintf_string (fmt, args);
863 -1, args);
864 GCPRO1 (obj); 860 GCPRO1 (obj);
865 message_append_internal (0, obj, 0, -1); 861 message_append_internal (0, obj, 0, -1);
866 UNGCPRO; 862 UNGCPRO;
867 } 863 }
868 else 864 else