* insdel.c, lisp.h (buffer_overflow): New function.

(insert_from_buffer_1, replace_range, replace_range_2):
* insdel.c (make_gap_larger):
* editfns.c (Finsert_char):
* fileio.c (Finsert_file_contents): Use it, to normalize wording.

diff --git a/src/ChangeLog b/src/ChangeLog
index ed94ce5599c3cf4c4dad63c62ae665003414787d..f7f18332288bcbda7e4c53fd8ef5a734b000884f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2011-06-16  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * insdel.c, lisp.h (buffer_overflow): New function.
+       (insert_from_buffer_1, replace_range, replace_range_2):
+       * insdel.c (make_gap_larger):
+       * editfns.c (Finsert_char):
+       * fileio.c (Finsert_file_contents): Use it, to normalize wording.
+
        * buffer.h (BUF_BYTES_MAX): Cast to ptrdiff_t so that it's signed.
 
 2011-06-15  Paul Eggert  <eggert@cs.ucla.edu>

diff --git a/src/editfns.c b/src/editfns.c
index 9678d4da6a28890367ea2387f99972264d8b0cbc..dec0133951e662a5c9f5a2ac49fd177c73d11863 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -2344,7 +2344,7 @@ from adjoining text, if those properties are sticky.  */)
   else
     str[0] = c, len = 1;
   if (BUF_BYTES_MAX / len < XINT (count))
-    error ("Maximum buffer size would be exceeded");
+    buffer_overflow ();
   n = XINT (count) * len;
   if (n <= 0)
     return Qnil;

diff --git a/src/fileio.c b/src/fileio.c
index fd5277cbd591f404f611c606111b55733ba7aeb9..4458a3a4807cfe63a74d84a9e9497712b67709da 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3264,7 +3264,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
      platform that allows file sizes greater than the maximum off_t value.  */
   if (! not_regular
       && ! (0 <= st.st_size && st.st_size <= BUF_BYTES_MAX))
-    error ("Maximum buffer size exceeded");
+    buffer_overflow ();
 
   /* Prevent redisplay optimizations.  */
   current_buffer->clip_changed = 1;
@@ -3808,7 +3808,7 @@ variable `last-coding-system-used' to the coding system actually used.  */)
       /* Make sure point-max won't overflow after this insertion.  */
       XSETINT (temp, total);
       if (total != XINT (temp))
-       error ("Maximum buffer size exceeded");
+       buffer_overflow ();
     }
   else
     /* For a special file, all we can do is guess.  */

diff --git a/src/insdel.c b/src/insdel.c
index c0cccc65d6a5c5d683bd998bbb3fec305c7f0b7b..875274df8e41000baf5746d5bb76e21119265b7d 100644 (file)
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -391,6 +391,12 @@ adjust_markers_for_replace (EMACS_INT from, EMACS_INT from_byte,
 }
 
 \f
+void
+buffer_overflow (void)
+{
+  error ("Maximum buffer size exceeded");
+}
+
 /* Make the gap NBYTES_ADDED bytes longer.  */
 
 static void
@@ -408,7 +414,7 @@ make_gap_larger (EMACS_INT nbytes_added)
     if (total_size < 0
        /* Don't allow a buffer size that won't fit in a Lisp integer.  */
        || total_size != XINT (make_number (total_size)))
-      error ("Buffer exceeds maximum size");
+      buffer_overflow ();
   }
 
   enlarge_buffer_text (current_buffer, nbytes_added);
@@ -1105,7 +1111,7 @@ insert_from_buffer_1 (struct buffer *buf,
   /* Make sure point-max won't overflow after this insertion.  */
   XSETINT (temp, outgoing_nbytes + Z);
   if (outgoing_nbytes + Z != XINT (temp))
-    error ("Maximum buffer size exceeded");
+    buffer_overflow ();
 
   /* Do this before moving and increasing the gap,
      because the before-change hooks might move the gap
@@ -1350,7 +1356,7 @@ replace_range (EMACS_INT from, EMACS_INT to, Lisp_Object new,
   /* Make sure point-max won't overflow after this insertion.  */
   XSETINT (temp, Z_BYTE - nbytes_del + insbytes);
   if (Z_BYTE - nbytes_del + insbytes != XINT (temp))
-    error ("Maximum buffer size exceeded");
+    buffer_overflow ();
 
   GCPRO1 (new);
 
@@ -1495,7 +1501,7 @@ replace_range_2 (EMACS_INT from, EMACS_INT from_byte,
   /* Make sure point-max won't overflow after this insertion.  */
   XSETINT (temp, Z_BYTE - nbytes_del + insbytes);
   if (Z_BYTE - nbytes_del + insbytes != XINT (temp))
-    error ("Maximum buffer size exceeded");
+    buffer_overflow ();
 
   /* Make sure the gap is somewhere in or next to what we are deleting.  */
   if (from > GPT)

diff --git a/src/lisp.h b/src/lisp.h
index 83534e5543374faceb1c95b67320e378ee7115b5..75827deda1a46d06a608b4f49442b7f8173ae5ec 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2635,6 +2635,7 @@ extern void init_image (void);
 extern Lisp_Object Qinhibit_modification_hooks;
 extern void move_gap (EMACS_INT);
 extern void move_gap_both (EMACS_INT, EMACS_INT);
+extern void buffer_overflow (void) NO_RETURN;
 extern void make_gap (EMACS_INT);
 extern EMACS_INT copy_text (const unsigned char *, unsigned char *,
                            EMACS_INT, int, int);