Re: 22.1.90; desktop-save throws (error "No buffer named <uniquified buffername>")

[Juanma Barranquero]

On Feb 6, 2008 5:12 PM, Martin Fischer <address@hidden> wrote:

>     Debugger entered--Lisp error: (error "No buffer named ludwig")
>       desktop-save-buffer-p(nil "ludwig" dired-mode nil 185 (nil nil) t 
> ("c:/otto/ludwig/") nil)
>       apply(desktop-save-buffer-p (nil "ludwig" dired-mode nil 185 (nil nil) 
> t ("c:/otto/ludwig/") nil))
>       desktop-save("~/")
>       call-interactively(desktop-save)
>       execute-extended-command(nil)
>       call-interactively(execute-extended-command)

Plese try the following patch. Is a bit of hackish, but doing it
cleanly would need more changes to desktop.el and perhaps changing the
desktop file version, which is a no-no during the pretest.

             Juanma


Index: lisp/desktop.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/desktop.el,v
retrieving revision 1.108.2.6
diff -u -2 -r1.108.2.6 desktop.el
--- lisp/desktop.el     7 Jan 2008 02:44:57 -0000       1.108.2.6
+++ lisp/desktop.el     8 Feb 2008 16:46:43 -0000
@@ -654,9 +654,10 @@
   (set-buffer buffer)
   (list
+   ;; base name of the buffer; replaces the buffer name if managed by uniquify
+   (and (bound-and-true-p uniquify-managed)
+       (uniquify-item-base (car uniquify-managed)))
    ;; basic information
    (desktop-file-name (buffer-file-name) desktop-dirname)
-   (if (bound-and-true-p uniquify-managed)
-       (uniquify-item-base (car uniquify-managed))
-     (buffer-name))
+   (buffer-name)
    major-mode
    ;; minor modes
@@ -887,5 +888,5 @@
          (insert "\n;; Buffer section -- buffers listed in same order as in
buffer list:\n")
          (dolist (l (mapcar 'desktop-buffer-info (buffer-list)))
-           (when (apply 'desktop-save-buffer-p l)
+           (when (apply 'desktop-save-buffer-p (cdr l))
              (insert "("
                      (if (or (not (integerp eager))
@@ -897,4 +898,6 @@
                      " "
                      desktop-file-version)
+             (let ((base (pop l)))
+               (when base (setcar (nthcdr 1 l) base)))
              (dolist (e l)
                (insert "\n  " (desktop-value-to-string e)))