(PENDING_OUTPUT_COUNT) [__GNU_LIBRARY__]: Alternate definition for the GNU

[gnu-emacs] / src / insdel.c

diff --git a/src/insdel.c b/src/insdel.c
index f9263fabfd959c150a56a6e4b54ffbf8f287ea7a..711e272da597174f5a71673bc022e6843b334805 100644 (file)
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -18,7 +18,7 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 
-#include "config.h"
+#include <config.h>
 #include "lisp.h"
 #include "intervals.h"
 #include "buffer.h"
@@ -327,9 +327,10 @@ insert (string, length)
    before we bcopy the stuff into the buffer, and relocate the string
    without insert noticing.  */
 
-insert_from_string (string, pos, length)
+insert_from_string (string, pos, length, inherit)
      Lisp_Object string;
      register int pos, length;
+     int inherit;
 {
   register Lisp_Object temp;
   struct gcpro gcpro1;
@@ -365,8 +366,8 @@ insert_from_string (string, pos, length)
   Z += length;
 
   /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
-  graft_intervals_into_buffer (XSTRING (string)->intervals, point,
-                              current_buffer);
+  graft_intervals_into_buffer (XSTRING (string)->intervals, point, length,
+                              current_buffer, inherit);
 
   SET_PT (point + length);
 
@@ -407,12 +408,13 @@ insert_before_markers (string, length)
 
 /* Insert part of a Lisp string, relocating markers after.  */
 
-insert_from_string_before_markers (string, pos, length)
+insert_from_string_before_markers (string, pos, length, inherit)
      Lisp_Object string;
      register int pos, length;
+     int inherit;
 {
   register int opoint = point;
-  insert_from_string (string, pos, length);
+  insert_from_string (string, pos, length, inherit);
   adjust_markers (opoint - 1, opoint, length);
 }
 \f