# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1202826994 0
# Node ID 5198b2fd41e61afb9d98d3558144956e830700c5
# Parent  b2a178c5133ec72cf2664b2a41fda82b17f76f74
*** empty log message ***

diff -r b2a178c5133e -r 5198b2fd41e6 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Feb 12 14:34:01 2008 +0000
+++ b/lisp/ChangeLog	Tue Feb 12 14:36:34 2008 +0000
@@ -1,3 +1,14 @@
+2008-02-12  Juanma Barranquero  <lekktu@gmail.com>
+
+	* uniquify.el (uniquify-buffer-base-name): New function.
+	Suggested by Stefan Monnier <monnier@iro.umontreal.ca>.
+
+	* desktop.el (uniquify-managed): Don't defvar.
+	(desktop-buffer-info): Use `uniquify-buffer-base-name', not
+	`uniquify-managed'.  Return also the buffer's base name.
+	(desktop-save): When saving the buffer info, filter out the base name,
+	and save it as buffer name if the buffer is managed by uniquify.
+
 2008-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* diff-mode.el (diff-beginning-of-file-and-junk): If we're on the