(single_submenu): Set up help string.

[gnu-emacs] / src / doprnt.c

diff --git a/src/doprnt.c b/src/doprnt.c
index 7eaa2717056afa934626d4726a653e3c91176824..1d792a9a29193a41dbb3dcfe42407318ed5ed363 100644 (file)
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -29,6 +29,14 @@ Boston, MA 02111-1307, USA.  */
 #include <float.h>
 #endif
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
 #include "lisp.h"
 
 #ifndef DBL_MAX_10_EXP
@@ -108,7 +116,7 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
   char *big_buffer = 0;
 
   register int tem;
-  char *string;
+  unsigned char *string;
   char fixed_buffer[20];       /* Default buffer for small formatting. */
   char *fmtcpy;
   int minlen;
@@ -135,7 +143,7 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
 
          fmt++;
          /* Copy this one %-spec into fmtcpy.  */
-         string = fmtcpy;
+         string = (unsigned char *)fmtcpy;
          *string++ = '%';
          while (1)
            {
@@ -207,7 +215,7 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
                abort ();
              sprintf (sprintf_buffer, fmtcpy, args[cnt++]);
              /* Now copy into final output, truncating as nec.  */
-             string = sprintf_buffer;
+             string = (unsigned char *)sprintf_buffer;
              goto doit;
 
            case 'f':
@@ -221,7 +229,7 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
                u.half[1] = args[cnt++];
                sprintf (sprintf_buffer, fmtcpy, u.d);
                /* Now copy into final output, truncating as nec.  */
-               string = sprintf_buffer;
+               string = (unsigned char *)sprintf_buffer;
                goto doit;
              }
 
@@ -234,13 +242,13 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
                minlen = atoi (&fmtcpy[1]);
              if (lispstrings)
                {
-                 string = (char *) ((struct Lisp_String *)args[cnt])->data;
+                 string = ((struct Lisp_String *)args[cnt])->data;
                  tem = ((struct Lisp_String *)args[cnt])->size;
                  cnt++;
                }
              else
                {
-                 string = args[cnt++];
+                 string = (unsigned char *)args[cnt++];
                  tem = strlen (string);
                }
              width = strwidth (string, tem);
@@ -293,7 +301,8 @@ doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
            case 'c':
              if (cnt == nargs)
                error ("not enough arguments for format string");
-             tem = CHAR_STRING ((EMACS_INT) args[cnt], charbuf, string);
+             tem = CHAR_STRING ((int) (EMACS_INT) args[cnt], charbuf);
+             string = charbuf;
              cnt++;
              string[tem] = 0;
              width = strwidth (string, tem);