diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2006-01-21 09:32:52 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2006-01-21 09:32:52 +0000 |
| commit | 6ff901c753a11e45d5fbd70cd35ed10746bfafcd (patch) | |
| tree | fbb7a396f7afc7f7bed908503ce0da477d85d5cb | |
| parent | 6a056c5d38f7059b7c70e784dcdf62eb00d561d7 (diff) | |
| download | emacs-6ff901c753a11e45d5fbd70cd35ed10746bfafcd.tar.gz emacs-6ff901c753a11e45d5fbd70cd35ed10746bfafcd.tar.bz2 emacs-6ff901c753a11e45d5fbd70cd35ed10746bfafcd.zip | |
(command-line-1): Handle --no-desktop if desktop.el is not loaded.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/startup.el | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d8beecfd4a0..54af57feb0f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-01-21 Eli Zaretskii <eliz@gnu.org> + + * startup.el (command-line-1): Handle --no-desktop if desktop.el + is not loaded. + 2006-01-20 Jay Belanger <belanger@truman.edu> * calc/calcalg2.el (calc-sum-rec): Fix the sum when the lower diff --git a/lisp/startup.el b/lisp/startup.el index bc00dc36ba6..4db086fa7a7 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1628,7 +1628,7 @@ normal otherwise." (longopts (append '(("--funcall") ("--load") ("--insert") ("--kill") ("--directory") ("--eval") ("--execute") ("--no-splash") - ("--find-file") ("--visit") ("--file")) + ("--find-file") ("--visit") ("--file") ("--no-desktop")) (mapcar (lambda (elt) (list (concat "-" (car elt)))) command-switch-alist))) @@ -1728,6 +1728,13 @@ normal otherwise." ((equal argi "-kill") (kill-emacs t)) + ;; This is for when they use --no-desktop with -q, or + ;; don't load Desktop in their .emacs. If desktop.el + ;; _is_ loaded, it will handle this switch, and we + ;; won't see it by the time we get here. + ((equal argi "-no-desktop") + (message "\"--no-desktop\" ignored because the Desktop package is not loaded")) + ((string-match "^\\+[0-9]+\\'" argi) (setq line (string-to-number argi))) |