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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 438e2b5f52a50b04fc8035e346b46b7294b5e726..eb80e96e3314f634da02b3d06d1504f4f29c15fc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * diff-mode.el (diff-sanity-check-hunk): Only accept an empty line if
@@ -6,7 +11,7 @@
 2008-02-28  Juri Linkov  <juri@jurta.org>
 
        * startup.el (normal-splash-screen): Add argument `concise'.
-       Remove unused binding `prev-buffer'. Let-bind `splash-buffer'
+       Remove unused binding `prev-buffer'.  Let-bind `splash-buffer'
        to the created buffer.  If `concise' is non-nil, call
        `display-buffer', otherwise `switch-to-buffer'.  Doc fix.
        (display-startup-screen): Add argument `concise' to the call to

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 8be86571f1335e71660b55df7ab0368c6939e4f1..fbf9ed5c04493203399203f24a67bda7ba398d1e 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -895,8 +895,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"))))