Merge from trunk

1 files changed, 2 insertions, 2 deletions

diff --git a/src/buffer.c b/src/buffer.c
index 7a0260f584a..5229f899e65 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1320,7 +1320,7 @@ No argument or nil as argument means do this for the current buffer.  */)
 }
 
 /*
-  DEFVAR_LISP ("kill-buffer-hook", no_cell, "\
+  DEFVAR_LISP ("kill-buffer-hook", ..., "\
 Hook to be run (by `run-hooks', which see) when a buffer is killed.\n\
 The buffer being killed will be current while the hook is running.\n\
 See `kill-buffer'."
@@ -2401,7 +2401,7 @@ current buffer is cleared.  */)
               *p = tmp[0];
               TEMP_SET_PT_BOTH (pos + 1, pos + 1);
               bytes--;
-              insert_1_both (tmp + 1, bytes, bytes, 1, 0, 0);
+              insert_1_both ((char *) tmp + 1, bytes, bytes, 1, 0, 0);
               /* Now the gap is after the just inserted data.  */
               pos = GPT;
               p = GAP_END_ADDR;