# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1184280233 0
# Node ID 33c9a00ace1ef320571d41a1d8ff32dfc179af4d
# Parent  512f169b02bf11e6a3fbc27a49af2d45240919c4
(desktop-buffer-info, desktop-save): Use `desktop-dirname' instead of `dirname'.

diff -r 512f169b02bf -r 33c9a00ace1e lisp/desktop.el
--- a/lisp/desktop.el	Thu Jul 12 10:43:46 2007 +0000
+++ b/lisp/desktop.el	Thu Jul 12 22:43:53 2007 +0000
@@ -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).