Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 90146:a4445dd2a017 | 90147:e1fbb019c538 |
|---|---|
| 1028 ;; functions are processed after `after-init-hook'. | 1028 ;; functions are processed after `after-init-hook'. |
| 1029 (add-hook | 1029 (add-hook |
| 1030 'after-init-hook | 1030 'after-init-hook |
| 1031 '(lambda () | 1031 '(lambda () |
| 1032 (let ((key "--no-desktop")) | 1032 (let ((key "--no-desktop")) |
| 1033 (if (member key command-line-args) | 1033 (when (member key command-line-args) |
| 1034 (delete key command-line-args) | 1034 (setq command-line-args (delete key command-line-args)) |
| 1035 (when desktop-save-mode (desktop-read)))))) | 1035 (setq desktop-save-mode nil))) |
| 1036 (when desktop-save-mode (desktop-read)))) | |
| 1036 | 1037 |
| 1037 (provide 'desktop) | 1038 (provide 'desktop) |
| 1038 | 1039 |
| 1039 ;;; arch-tag: 221907c3-1771-4fd3-9c2e-c6f700c6ede9 | 1040 ;;; arch-tag: 221907c3-1771-4fd3-9c2e-c6f700c6ede9 |
| 1040 ;;; desktop.el ends here | 1041 ;;; desktop.el ends here |