2 files changed, 5 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 09a4a72a562..d16a19e15eb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-09  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * buffer.c (Fgenerate_new_buffer_name): Use EMACS_INT for count, not int.
+
         * data.c (Qcompiled_function): Now static.
 
 2011-06-08  Paul Eggert  <eggert@cs.ucla.edu>
diff --git a/src/buffer.c b/src/buffer.c
index e9ff8f492ba..453ea838902 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -841,8 +841,8 @@ it is in the sequence to be tried) even if a buffer with that name exists.  */)
   (register Lisp_Object name, Lisp_Object ignore)
 {
   register Lisp_Object gentemp, tem;
-  int count;
-  char number[10];
+  EMACS_INT count;
+  char number[INT_BUFSIZE_BOUND (EMACS_INT) + sizeof "<>"];
 
   CHECK_STRING (name);
 
@@ -856,7 +856,7 @@ it is in the sequence to be tried) even if a buffer with that name exists.  */)
   count = 1;
   while (1)
     {
-      sprintf (number, "<%d>", ++count);
+      sprintf (number, "<%"pI"d>", ++count);
       gentemp = concat2 (name, build_string (number));
       tem = Fstring_equal (gentemp, ignore);
       if (!NILP (tem))