diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-06-21 15:15:42 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-06-21 15:15:42 +0800 |
| commit | e76f0800d2ceef239e8db3c2f81c6b71d4c70302 (patch) | |
| tree | b1baa57c1d24db3042f48c78e57b3123a8af5a99 /lisp/desktop.el | |
| parent | f10deafb12a12daa85f8357a73752765549969c0 (diff) | |
| download | emacs-e76f0800d2ceef239e8db3c2f81c6b71d4c70302.tar.gz | |
Fixes to desktop reading logic.
* desktop.el (desktop-read): Don't prompt if daemon.
(desktop-path): Remove . from the default value.
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index 5d9982940bf..2fd9d7f10ad 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -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)) |