(desktop-read): Set `desktop-dirname' to nil before calling

`desktop-not-loaded-hook' to allow modifying it.
Don't show warning message if `desktop-dirname' was modified.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 627e29dbc4fc7a12c65d5ae39117677a18e23574..2c05f010dccc769d4d704f534859376a525ab0bd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,12 @@
+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  Alan Mackenzie  <acm@muc.de>
 
-       * progmodes/cc-mode.el (c-neutralize-syntax-in-CPP): Fix coding
-       bug.
+       * progmodes/cc-mode.el (c-neutralize-syntax-in-CPP): Fix coding bug.
 
        * progmodes/cc-langs.el (c-before-font-lock-function): Fix bug in
        doc-string, "c-old-LEN" -> "c-old-END".
@@ -156,7 +161,7 @@
        (verilog-pretty-declarations): Add new flag to ask it to refrain
        from printing to the message buffer.
        (verilog-pretty-expr): Add a QUIET flag to ask it to refrain from
-       printing to the message buffer.  Improve handling of the many
+       printing to the message buffer.  Improve handling of the many
        types of expression line up.
        (verilog-just-one-space): Remove printing of an empty message.
        (verilog-get-lineup-indent): Rework to support the better handling

diff --git a/lisp/desktop.el b/lisp/desktop.el
index fbf9ed5c04493203399203f24a67bda7ba398d1e..a042828e19c44d0b6f207f5ce2eb2f296251e143 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -967,11 +967,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)