summaryrefslogtreecommitdiff
path: root/lisp/desktop.el
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2007-07-12 22:47:51 +0000
committerJuanma Barranquero <lekktu@gmail.com>2007-07-12 22:47:51 +0000
commiteca04a35d2f9d7c77222de475fe0a9c9c6a3fe7c (patch)
treeb352bf7522c7b066b4909527d705d3b994581058 /lisp/desktop.el
parent88a337ec3ddd28d9c108d411a155018e773960b2 (diff)
downloademacs-eca04a35d2f9d7c77222de475fe0a9c9c6a3fe7c.tar.gz
(desktop-buffer-info, desktop-save): Use `desktop-dirname' instead of `dirname'.
Diffstat (limited to 'lisp/desktop.el')
-rw-r--r--lisp/desktop.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el
index d9939ac0b85..cafa1868b33 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -652,7 +652,7 @@ is nil, ask the user where to save the desktop."
(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 @@ is nil, ask the user where to save the desktop."
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 @@ See also `desktop-base-file-name'."
(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).