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

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      07/07/12 22:39:35

Index: desktop.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/desktop.el,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- desktop.el  20 Jun 2007 10:08:07 -0000      1.112
+++ desktop.el  12 Jul 2007 22:39:35 -0000      1.113
@@ -652,7 +652,7 @@
   (set-buffer buffer)
   (list
    ;; basic information
-   (desktop-file-name (buffer-file-name) dirname)
+   (desktop-file-name (buffer-file-name) desktop-dirname)
    (buffer-name)
    major-mode
    ;; minor modes
@@ -673,7 +673,7 @@
    buffer-read-only
    ;; auxiliary information
    (when (functionp desktop-save-buffer)
-     (funcall desktop-save-buffer dirname))
+     (funcall desktop-save-buffer desktop-dirname))
    ;; local variables
    (let ((locals desktop-locals-to-save)
         (loclist (buffer-local-variables))
@@ -896,7 +896,7 @@
                (insert "\n  " (desktop-value-to-string e)))
              (insert ")\n\n")))
 
-         (setq default-directory dirname)
+         (setq default-directory desktop-dirname)
          (let ((coding-system-for-write 'emacs-mule))
            (write-region (point-min) (point-max) (desktop-full-file-name) nil 
'nomessage))
          ;; We remember when it was modified (which is presumably just now).