From 9e29c91ca36289e7aee08b739fcaf3877b63d82f Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Thu, 12 Jul 2007 22:40:00 +0000 Subject: [PATCH] (desktop-buffer-info, desktop-save): Use `desktop-dirname' instead of `dirname'. --- lisp/ChangeLog | 6 +++++- lisp/desktop.el | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0792291a4a3..2e3d60d70e1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2007-07-12 Davis Herring + + * desktop.el (desktop-buffer-info, desktop-save): + Use `desktop-dirname' instead of `dirname'. + 2007-07-12 Paul Pogonyshev * 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 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). -- 2.39.2