Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-20 03:47:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Eli Zaretskii 2006-01-21 09:32:52 +00:00
parent 6a056c5d38
commit 6ff901c753
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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

9
lisp/startup.el
View file

@ -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)))