Mercurial > emacs
changeset 73717:efdfdf0db9c0
(command-line-1): Kill emacs if the last frame is deleted while
evaluating the command-line arguments.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 05 Nov 2006 17:35:08 +0000 |
| parents | 6174a221d1ef |
| children | 6ae938f52efb |
| files | lisp/startup.el |
| diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Sun Nov 05 17:34:47 2006 +0000 +++ b/lisp/startup.el Sun Nov 05 17:35:08 2006 +0000 @@ -1893,7 +1893,12 @@ (setq line 0) (unless (< column 1) (move-to-column (1- column))) - (setq column 0)))))))) + (setq column 0)))))) + ;; In unusual circumstances, the execution of Lisp code due + ;; to command-line options can cause the last visible frame + ;; to be deleted. In this case, kill emacs to avoid an + ;; abort later. + (unless (frame-live-p (selected-frame)) (kill-emacs nil)))) ;; If 3 or more files visited, and not all visible, ;; show user what they all are. But leave the last one current.