upstream

1 files changed, 5 insertions, 5 deletions

diff --git a/src/editfns.c b/src/editfns.c
index 297f7b6d7e4..6759016766f 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2107,7 +2107,7 @@ static char set_time_zone_rule_tz2[] = "TZ=GMT+1";
 void
 set_time_zone_rule (const char *tzstring)
 {
-  int envptrs;
+  ptrdiff_t envptrs;
   char **from, **to, **newenv;
 
   /* Make the ENVIRON vector longer with room for TZSTRING.  */
@@ -3357,7 +3357,7 @@ usage: (save-restriction &rest BODY)  */)
 static char *message_text;
 
 /* Allocated length of that buffer.  */
-static int message_length;
+static ptrdiff_t message_length;
 
 DEFUN ("message", Fmessage, Smessage, 1, MANY, 0,
        doc: /* Display a message at the bottom of the screen.
@@ -3439,8 +3439,8 @@ usage: (message-box FORMAT-STRING &rest ARGS)  */)
         }
       if (SBYTES (val) > message_length)
         {
+          message_text = (char *) xrealloc (message_text, SBYTES (val));
           message_length = SBYTES (val);
-          message_text = (char *)xrealloc (message_text, message_length);
         }
       memcpy (message_text, SDATA (val), SBYTES (val));
       message2 (message_text, SBYTES (val),
@@ -3889,7 +3889,7 @@ usage: (format STRING &rest OBJECTS)  */)
                       : -1)),
 
                 /* Maximum number of bytes generated by any format, if
-                   precision is no more than DBL_USEFUL_PRECISION_MAX.
+                   precision is no more than USEFUL_PRECISION_MAX.
                    On all practical hosts, %f is the worst case.  */
                 SPRINTF_BUFSIZE =
                   sizeof "-." + (DBL_MAX_10_EXP + 1) + USEFUL_PRECISION_MAX,
@@ -4165,7 +4165,7 @@ usage: (format STRING &rest OBJECTS)  */)
          character.  CONVBYTES says how much room is needed.  Allocate
          enough room (and then some) and do it again.  */
       {
-        EMACS_INT used = p - buf;
+        ptrdiff_t used = p - buf;
 
         if (max_bufsize - used < convbytes)
           string_overflow ();