Commit 6ff901c7 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

(command-line-1): Handle --no-desktop if desktop.el is not loaded.

parent 6a056c5d
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> 2006-01-20 Jay Belanger <belanger@truman.edu>
   
* calc/calcalg2.el (calc-sum-rec): Fix the sum when the lower * calc/calcalg2.el (calc-sum-rec): Fix the sum when the lower
......
...@@ -1628,7 +1628,7 @@ normal otherwise." ...@@ -1628,7 +1628,7 @@ normal otherwise."
(longopts (longopts
(append '(("--funcall") ("--load") ("--insert") ("--kill") (append '(("--funcall") ("--load") ("--insert") ("--kill")
("--directory") ("--eval") ("--execute") ("--no-splash") ("--directory") ("--eval") ("--execute") ("--no-splash")
("--find-file") ("--visit") ("--file")) ("--find-file") ("--visit") ("--file") ("--no-desktop"))
(mapcar (lambda (elt) (mapcar (lambda (elt)
(list (concat "-" (car elt)))) (list (concat "-" (car elt))))
command-switch-alist))) command-switch-alist)))
...@@ -1728,6 +1728,13 @@ normal otherwise." ...@@ -1728,6 +1728,13 @@ normal otherwise."
((equal argi "-kill") ((equal argi "-kill")
(kill-emacs t)) (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) ((string-match "^\\+[0-9]+\\'" argi)
(setq line (string-to-number argi))) (setq line (string-to-number argi)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment