diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2007-07-12 22:40:00 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2007-07-12 22:40:00 +0000 |
| commit | 9e29c91ca36289e7aee08b739fcaf3877b63d82f (patch) | |
| tree | 33e535665e0fec32bd24d2468a4359d3603db762 /lisp/desktop.el | |
| parent | 9c0a6042d2d9ad43dc2bc1f66f969ca35963003d (diff) | |
| download | emacs-9e29c91ca36289e7aee08b739fcaf3877b63d82f.tar.gz | |
(desktop-buffer-info, desktop-save): Use `desktop-dirname' instead of `dirname'.
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index e709a6394e3..4ee378adb06 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). |