# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1162748108 0
# Node ID efdfdf0db9c0cc60c53495791dada0a0d85f398b
# Parent  6174a221d1efd9bebee317b41abc5ce9c50ebdf3
(command-line-1): Kill emacs if the last frame is deleted while
evaluating the command-line arguments.

diff -r 6174a221d1ef -r efdfdf0db9c0 lisp/startup.el
--- 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.