(Frename_buffer): Fix gcpro problems.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/buffer.c b/src/buffer.c
index d14d33c74d7..87a81658fed 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -608,9 +608,11 @@ This does not change the name of the visited file (if any).")
 
   XSET (buf, Lisp_Buffer, current_buffer);
   Fsetcar (Frassq (buf, Vbuffer_alist), name);
-  if (NILP (current_buffer->filename) && !NILP (current_buffer->auto_save_file_name))
+  if (NILP (current_buffer->filename)
+      && !NILP (current_buffer->auto_save_file_name))
     call0 (intern ("rename-auto-save-file"));
-  return name;
+  /* refetch since that last call may have done GC */
+  return current_buffer->name;
 }
 
 DEFUN ("other-buffer", Fother_buffer, Sother_buffer, 0, 2, 0,