mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Fixes to desktop reading logic.

Browse source 
* desktop.el (desktop-read): Don't prompt if daemon.
(desktop-path): Remove . from the default value.
This commit is contained in:
Chong Yidong 2012-06-21 15:15:42 +08:00
parent f10deafb12
commit e76f0800d2
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/desktop.el
View file

@ -220,7 +220,7 @@ the normal hook `desktop-not-loaded-hook' is run."
:group 'desktop
:version "22.2")
(defcustom desktop-path (list "." user-emacs-directory "~")
(defcustom desktop-path (list user-emacs-directory "~")
"List of directories to search for the desktop file.
The base name of the file is specified in `desktop-base-file-name'."
:type '(repeat directory)
@ -410,8 +410,7 @@ is passed as the argument DESKTOP-BUFFER-MISC to functions in
'desktop-save-buffer "22.1")
;;;###autoload
(defvar desktop-buffer-mode-handlers
nil
(defvar desktop-buffer-mode-handlers nil
"Alist of major mode specific functions to restore a desktop buffer.
Functions listed are called by `desktop-create-buffer' when `desktop-read'
evaluates the desktop file. List elements must have the form
@ -471,8 +470,7 @@ this table. See also `desktop-minor-mode-handlers'."
:group 'desktop)
;;;###autoload
(defvar desktop-minor-mode-handlers
nil
(defvar desktop-minor-mode-handlers nil
"Alist of functions to restore non-standard minor modes.
Functions are called by `desktop-create-buffer' to restore minor modes.
List elements must have the form
@ -981,6 +979,7 @@ It returns t if a desktop file was loaded, nil otherwise."
(if (and owner
(memq desktop-load-locked-desktop '(nil ask))
(or (null desktop-load-locked-desktop)
(daemonp)
(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)))))
(let ((default-directory desktop-dirname))