(desktop-save): Save the buffer name if the uniquified base name is empty.

2 files changed, 10 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aed4be7a1d9..34a15ce44d1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,12 @@
+2008-02-29  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el (desktop-save): Save the buffer name if the
+        uniquified base name is empty.
+
 2008-02-29  Nick Roberts  <nickrob@snap.net.nz>
 
-        * progmodes/gdb-ui.el (gdb-info-stack-custom): Apply
-        function-name-face correctly when user has
-        "set print address off".
+        * progmodes/gdb-ui.el (gdb-info-stack-custom): Apply function-name-face
+        correctly when user has "set print address off".
 
 2008-02-28  Juanma Barranquero  <lekktu@gmail.com>
 
diff --git a/lisp/desktop.el b/lisp/desktop.el
index f65c68ec4e6..ce10b19894f 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -897,8 +897,9 @@ See also `desktop-base-file-name'."
                           "desktop-append-buffer-args")
                         " "
                         desktop-file-version)
-                ;; If the base name is non-nil, we save it instead of the buffer name
-                (when base (setcar (nthcdr 1 l) base))
+                ;; If there's a non-empty base name, we save it instead of the buffer name
+                (when (and base (not (string= base "")))
+                  (setcar (nthcdr 1 l) base))
                 (dolist (e l)
                   (insert "\n  " (desktop-value-to-string e)))
                 (insert ")\n\n"))))