From 794855cae23e94965b648d7ef559296bfa9282f7 Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 20 Jun 2007 10:12:44 +0000 Subject: (desktop-read): Run `desktop-not-loaded-hook' in the directory where the desktop file was found, as the docstring says. (desktop-kill): Use `read-directory-name'. --- lisp/desktop.el | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'lisp/desktop.el') diff --git a/lisp/desktop.el b/lisp/desktop.el index 191d1dbc291..e709a6394e3 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -626,9 +626,7 @@ is nil, ask the user where to save the desktop." (setq desktop-dirname (file-name-as-directory (expand-file-name - (call-interactively - (lambda (dir) - (interactive "DDirectory for desktop file: ") dir)))))) + (read-directory-name "Directory for desktop file: " nil nil t))))) (condition-case err (desktop-save desktop-dirname t) (file-error @@ -964,9 +962,9 @@ It returns t if a desktop file was loaded, nil otherwise." (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 - (setq desktop-dirname nil) (let ((default-directory desktop-dirname)) (run-hooks 'desktop-not-loaded-hook)) + (setq desktop-dirname nil) (message "Desktop file in use; not loaded.")) (desktop-lazy-abort) ;; Evaluate desktop buffer and remember when it was modified. -- cgit v1.2.1