Mercurial > emacs

changeset 81828:793a39ce6d90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(desktop-buffer-info, desktop-save): Use `desktop-dirname' instead of `dirname'.
author Juanma Barranquero <lekktu@gmail.com>
date Thu, 12 Jul 2007 22:39:35 +0000
parents 7b0fef180aa2
children b25b94f97be5
files lisp/desktop.el
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/desktop.el	Thu Jul 12 21:13:06 2007 +0000
+++ b/lisp/desktop.el	Thu Jul 12 22:39:35 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).