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

ae4370a8 · Juanma Barranquero · 10cbc34f · ae4370a8 · ae4370a8
Commit ae4370a8 authored Feb 29, 2008 by Juanma Barranquero
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

lisp/ChangeLog lisp/ChangeLog +7 -3

lisp/desktop.el lisp/desktop.el +3 -2

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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>


--- 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"))))