(desktop-buffer-info, desktop-save): Use `desktop-dirname' instead of `dirname'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0792291a4a32dd4a5023e77311a4e3213364cdc7..2e3d60d70e1dfa426289d64d8467923812a025da 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-12  Davis Herring  <herring@lanl.gov>
+
+       * desktop.el (desktop-buffer-info, desktop-save):
+       Use `desktop-dirname' instead of `dirname'.
+
 2007-07-12  Paul Pogonyshev  <pogonyshev@gmx.net>
 
        * progmodes/which-func.el (which-func-modes): Add `python-mode'.
@@ -94,7 +99,6 @@
        * emacs-lisp/autoload.el (autoload-generate-file-autoloads): Be careful
        with EOLs when generating MD5 checksums.
 
-
        * follow.el: Don't change the global map from the follow-mode-map
        defvar, but from the toplevel.  Use easy-menu to unify the Emacs and
        XEmacs code.

diff --git a/lisp/desktop.el b/lisp/desktop.el
index e709a6394e312bb5140669462b7c29e8153a0cb2..4ee378adb06177fea75af57684755aab7797430a 100644 (file)
--- 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).