# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1204381010 0
# Node ID 4cf1d5a7cc5206e5c8810b12a66cf182bedd2cf3
# Parent  1b9ed04041df3efa4e9d53738f514b1fe895a91d
(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.

diff -r 1b9ed04041df -r 4cf1d5a7cc52 lisp/desktop.el
--- a/lisp/desktop.el	Sat Mar 01 10:09:52 2008 +0000
+++ b/lisp/desktop.el	Sat Mar 01 14:16:50 2008 +0000
@@ -969,11 +969,11 @@
 		   (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)