diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-09 08:00:55 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-09 08:00:55 +0000 |
| commit | 1011c48763982d02797a7058556d29f639f6efca (patch) | |
| tree | 5f1b7529b4cc483b73475b89245633c5848b8a5e /lisp/desktop.el | |
| parent | 6f06dac7b57b8d73f4b26a855cd9862630192029 (diff) | |
| parent | 69e4c7c4bacf19e9e004605fcb1c067e478beffe (diff) | |
| download | emacs-1011c48763982d02797a7058556d29f639f6efca.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 803-805)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-227
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index 98b0826084e..ca5ed9290b0 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 @@ -965,9 +963,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. |