[Emacs-diffs] Changes to emacs/lisp/desktop.el,v [EMACS_22_BASE]

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Juanma Barranquero <lektu>      08/02/12 14:34:01

Index: desktop.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/desktop.el,v
retrieving revision 1.108.2.6
retrieving revision 1.108.2.7
diff -u -b -r1.108.2.6 -r1.108.2.7
--- desktop.el  7 Jan 2008 02:44:57 -0000       1.108.2.6
+++ desktop.el  12 Feb 2008 14:34:01 -0000      1.108.2.7
@@ -135,8 +135,6 @@
 
 ;;; Code:
 
-(defvar uniquify-managed)
-
 (defvar desktop-file-version "206"
   "Version number of desktop file format.
 Written into the desktop file and used at desktop read to provide
@@ -653,11 +651,11 @@
 (defun desktop-buffer-info (buffer)
   (set-buffer buffer)
   (list
+   ;; base name of the buffer; replaces the buffer name if managed by uniquify
+   (and (fboundp 'uniquify-buffer-base-name) (uniquify-buffer-base-name))
    ;; 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
    (let (ret)
@@ -886,6 +884,7 @@
 
          (insert "\n;; Buffer section -- buffers listed in same order as in 
buffer list:\n")
          (dolist (l (mapcar 'desktop-buffer-info (buffer-list)))
+           (let ((base (pop l)))
            (when (apply 'desktop-save-buffer-p l)
              (insert "("
                      (if (or (not (integerp eager))
@@ -896,9 +895,11 @@
                        "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))
              (dolist (e l)
                (insert "\n  " (desktop-value-to-string e)))
-             (insert ")\n\n")))
+               (insert ")\n\n"))))
 
          (setq default-directory desktop-dirname)
          (let ((coding-system-for-write 'emacs-mule))