2 files changed, 10 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b9b7eaee76..4c805de52f5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-01  Juanma Barranquero  <lekktu@gmail.com>
+
+        * desktop.el (desktop-read): Set `desktop-dirname' to nil before
+        running `desktop-not-loaded-hook' to allow modifying it.
+        Don't show warning message if `desktop-dirname' was modified.
+
 2008-03-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * diff-mode.el (diff-sanity-check-hunk): Only accept an empty line if
diff --git a/lisp/desktop.el b/lisp/desktop.el
index ce10b19894f..d52890e2a93 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -969,11 +969,11 @@ It returns t if a desktop file was loaded, nil otherwise."
                    (or (null desktop-load-locked-desktop)
                        (not (y-or-n-p (format "Warning: desktop file appears to be in use by PID %s.\n\
 Using it may cause conflicts.  Use it anyway? " owner)))))
-              (progn
-                (let ((default-directory desktop-dirname))
-                  (run-hooks 'desktop-not-loaded-hook))
+              (let ((default-directory desktop-dirname))
                 (setq desktop-dirname nil)
-                (message "Desktop file in use; not loaded."))
+                (run-hooks 'desktop-not-loaded-hook)
+                (unless desktop-dirname
+                  (message "Desktop file in use; not loaded.")))
             (desktop-lazy-abort)
             ;; Evaluate desktop buffer and remember when it was modified.
             (load (desktop-full-file-name) t t t)