Commit c41cf130 authored by Juanma Barranquero's avatar Juanma Barranquero

(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.
parent 6c8acaa1
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
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment