From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 16 Aug 2022 21:29:26 +0000 (-0400)
Subject: * src/buffer.c (Frename_buffer): Fix bug#56693
X-Git-Tag: emacs-29.0.90~1447^2~107
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b24f7667ad686093c2b013bc58e2f1234d7487fd;p=emacs.git

* src/buffer.c (Frename_buffer): Fix bug#56693
---

diff --git a/src/buffer.c b/src/buffer.c
index 98066a2eb60..4fd5b2be3e9 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1563,6 +1563,7 @@ This does not change the name of the visited file (if any).  */)
   (register Lisp_Object newname, Lisp_Object unique)
 {
   register Lisp_Object tem, buf;
+  Lisp_Object requestedname = newname;
 
   CHECK_STRING (newname);
 
@@ -1579,7 +1580,8 @@ This does not change the name of the visited file (if any).  */)
       if (NILP (unique) && XBUFFER (tem) == current_buffer)
 	return BVAR (current_buffer, name);
       if (!NILP (unique))
-	newname = Fgenerate_new_buffer_name (newname, BVAR (current_buffer, name));
+	newname = Fgenerate_new_buffer_name (newname,
+	                                     BVAR (current_buffer, name));
       else
 	error ("Buffer name `%s' is in use", SDATA (newname));
     }
@@ -1599,7 +1601,7 @@ This does not change the name of the visited file (if any).  */)
   run_buffer_list_update_hook (current_buffer);
 
   call2 (intern ("uniquify--rename-buffer-advice"),
-         BVAR (current_buffer, name), unique);
+         requestedname, unique);
 
   /* Refetch since that last call may have done GC.  */
   return BVAR (current_buffer, name);