Mercurial > emacs
diff lisp/desktop.el @ 90147:e1fbb019c538
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-39
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 258-271)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 66)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 21 Apr 2005 05:59:53 +0000 |
parents | 02f1dbc4a199 ef63bf685348 |
children | f9a65d7ebd29 |
line wrap: on
line diff
--- a/lisp/desktop.el Thu Apr 21 05:57:27 2005 +0000 +++ b/lisp/desktop.el Thu Apr 21 05:59:53 2005 +0000 @@ -1030,9 +1030,10 @@ 'after-init-hook '(lambda () (let ((key "--no-desktop")) - (if (member key command-line-args) - (delete key command-line-args) - (when desktop-save-mode (desktop-read)))))) + (when (member key command-line-args) + (setq command-line-args (delete key command-line-args)) + (setq desktop-save-mode nil))) + (when desktop-save-mode (desktop-read)))) (provide 'desktop)