# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1193505105 0
# Node ID 82fb16d03f6f9a97461eca6d969d1d756217d492
# Parent  80e25357226ef51964dbeb30c79ab534e6ed3e09
*** empty log message ***

diff -r 80e25357226e -r 82fb16d03f6f lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Oct 27 17:10:50 2007 +0000
+++ b/lisp/ChangeLog	Sat Oct 27 17:11:45 2007 +0000
@@ -1,3 +1,11 @@
+2007-10-27  Juanma Barranquero  <lekktu@gmail.com>
+
+	* desktop.el (uniquify-managed): Pacify byte compiler.
+	(desktop-buffer-info): If the buffer name is managed by uniquify,
+	save the base name, not the uniquified one.
+	(desktop-create-buffer): Allow `rename-buffer' to generate a new
+	name in case of conflict.
+
 2007-10-26  Glenn Morris  <rgm@gnu.org>
 
 	* emacs-lisp/bytecomp.el (byte-compile-warnings): Autoload the