From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 5 Nov 2006 17:35:08 +0000 (+0000)
Subject: (command-line-1): Kill emacs if the last frame is deleted while
X-Git-Tag: emacs-pretest-22.0.91~314
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4e35ba2f2e682faafc2a0f4abd738d3d208cbc8a;p=emacs.git

(command-line-1): Kill emacs if the last frame is deleted while
evaluating the command-line arguments.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 91491ac25e2..8268ac53400 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1893,7 +1893,12 @@ With a prefix argument, any user input hides the splash screen."
                          (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.