Mercurial > hg > xemacs-beta

diff 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
line wrap: on
line diff
--- a/src/minibuf.c	Fri Mar 08 13:33:14 2002 +0000
+++ b/src/minibuf.c	Wed Mar 13 08:54:06 2002 +0000
@@ -187,7 +187,7 @@
 
   val = call_command_loop (Qt);
 
-  return unbind_to (speccount, val);
+  return unbind_to_1 (speccount, val);
 }
 
 
@@ -214,8 +214,8 @@
     {
       while (l)
         {
-          Emchar c1 = DOWNCASE (current_buffer, charptr_emchar (s1));
-          Emchar c2 = DOWNCASE (current_buffer, charptr_emchar (s2));
+          Emchar c1 = DOWNCASE (0, charptr_emchar (s1));
+          Emchar c2 = DOWNCASE (0, charptr_emchar (s2));
 
           if (c1 == c2)
             {
@@ -688,8 +688,7 @@
     }
   else
     {
-      write_string_to_stdio_stream (stderr, 0, (const Intbyte *) "\n", 0, 1,
-				    Qterminal, 0);
+      stderr_out ("\n");
       return Qnil;
     }
 }
@@ -757,8 +756,7 @@
     {
       if (STRINGP (reloc))
 	nonreloc = XSTRING_DATA (reloc);
-      write_string_to_stdio_stream (stderr, 0, nonreloc, offset, length,
-				    Qterminal, 0);
+      write_string_1 (nonreloc + offset, length, Qexternal_debugging_output);
     }
 }
 
@@ -832,7 +830,7 @@
    on the format string; message_no_translate() does not. */
 
 static void
-message_1 (const char *fmt, va_list args)
+message_1 (const CIntbyte *fmt, va_list args)
 {
   /* This function can call lisp */
   if (fmt)
@@ -840,8 +838,7 @@
       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 Intbyte *) fmt, Qnil,
-						-1, args);
+      Lisp_Object obj = emacs_vsprintf_string (fmt, args);
       GCPRO1 (obj);
       message_internal (0, obj, 0, -1);
       UNGCPRO;
@@ -851,7 +848,7 @@
 }
 
 static void
-message_append_1 (const char *fmt, va_list args)
+message_append_1 (const CIntbyte *fmt, va_list args)
 {
   /* This function can call lisp */
   if (fmt)
@@ -859,8 +856,7 @@
       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 Intbyte *) fmt, Qnil,
-						-1, args);
+      Lisp_Object obj = emacs_vsprintf_string (fmt, args);
       GCPRO1 (obj);
       message_append_internal (0, obj, 0, -1);
       UNGCPRO;