Merge from origin/emacs-25

d08afa1 * etc/AUTHORS: Update the AUTHORS file
2668500 ;; * ChangeLog.2: ChangeLog update.
7acfaea ; ChangeLog fixes
97d28b4 * admin/authors.el (authors-valid-file-names): Addition.
9ab52f6 * admin/authors.el: Additions.
0e646c7 Warn about Cairo-related problems
bc4c07f Don't let completion break `declare' handling
66f95e0 Adjust match data before calling after-change-funs
52cf0d5 Do not show string-rectangle preview if minibuffer is empty
6a3d031 * etc/PROBLEMS: Add entry about selection problems under Plas...

# Conflicts:
#	ChangeLog.2
#	src/lisp.h

1 files changed, 3 insertions, 3 deletions

diff --git a/src/editfns.c b/src/editfns.c
index 61b2a871b73..732306af868 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3244,7 +3244,7 @@ Both characters must have the same length of multi-byte form.  */)
               /* replace_range is less efficient, because it moves the gap,
                  but it handles combining correctly.  */
               replace_range (pos, pos + 1, string,
-                             0, 0, 1);
+                             0, 0, 1, 0);
               pos_byte_next = CHAR_TO_BYTE (pos);
               if (pos_byte_next > pos_byte)
                 /* Before combining happened.  We should not increment
@@ -3457,7 +3457,7 @@ It returns the number of characters changed.  */)
                   /* This is less efficient, because it moves the gap,
                      but it should handle multibyte characters correctly.  */
                   string = make_multibyte_string ((char *) str, 1, str_len);
-                  replace_range (pos, pos + 1, string, 1, 0, 1);
+                  replace_range (pos, pos + 1, string, 1, 0, 1, 0);
                   len = str_len;
                 }
               else
@@ -3498,7 +3498,7 @@ It returns the number of characters changed.  */)
                 {
                   string = Fmake_string (make_number (1), val);
                 }
-              replace_range (pos, pos + len, string, 1, 0, 1);
+              replace_range (pos, pos + len, string, 1, 0, 1, 0);
               pos_byte += SBYTES (string);
               pos += SCHARS (string);
               cnt += SCHARS (string);