[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108671: Fixes to desktop reading log
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108671: Fixes to desktop reading logic. |
Date: |
Thu, 21 Jun 2012 15:15:42 +0800 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108671
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2012-06-21 15:15:42 +0800
message:
Fixes to desktop reading logic.
* desktop.el (desktop-read): Don't prompt if daemon.
(desktop-path): Remove . from the default value.
modified:
etc/NEWS
lisp/ChangeLog
lisp/desktop.el
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2012-06-19 06:49:50 +0000
+++ b/etc/NEWS 2012-06-21 07:15:42 +0000
@@ -153,6 +153,11 @@
The old `cl' is now deprecated and is nothing more than a bunch of aliases that
provide the old non-prefixed names.
+** Desktop
+
+*** `desktop-path' no longer includes the "." directory. Desktop
+files are now located in ~/.emacs.d by default.
+
** A new mode for Python.
This provides several new features, including:
per-buffer shells, better indentation, Python 3 support, and improved
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-06-20 16:21:57 +0000
+++ b/lisp/ChangeLog 2012-06-21 07:15:42 +0000
@@ -1,3 +1,8 @@
+2012-06-21 Chong Yidong <address@hidden>
+
+ * desktop.el (desktop-read): Don't prompt if daemon (Bug#11674).
+ (desktop-path): Remove . from the default value (Bug#10977).
+
2012-06-20 Chong Yidong <address@hidden>
* term.el (term-send-raw-meta): Make C-M-<char> keys work (Bug#8172).
=== modified file 'lisp/desktop.el'
--- a/lisp/desktop.el 2012-05-31 06:06:42 +0000
+++ b/lisp/desktop.el 2012-06-21 07:15:42 +0000
@@ -220,7 +220,7 @@
: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 @@
'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 @@
: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 @@
(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))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108671: Fixes to desktop reading logic.,
Chong Yidong <=