Mercurial > emacs
comparison lisp/startup.el @ 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 | b99c559d6365 |
| children | b6bae33729ea 02cf29720f31 |
comparison
equal
deleted
inserted
replaced
| 73716:6174a221d1ef | 73717:efdfdf0db9c0 |
|---|---|
| 1891 (or (zerop line) | 1891 (or (zerop line) |
| 1892 (goto-line line)) | 1892 (goto-line line)) |
| 1893 (setq line 0) | 1893 (setq line 0) |
| 1894 (unless (< column 1) | 1894 (unless (< column 1) |
| 1895 (move-to-column (1- column))) | 1895 (move-to-column (1- column))) |
| 1896 (setq column 0)))))))) | 1896 (setq column 0)))))) |
| 1897 ;; In unusual circumstances, the execution of Lisp code due | |
| 1898 ;; to command-line options can cause the last visible frame | |
| 1899 ;; to be deleted. In this case, kill emacs to avoid an | |
| 1900 ;; abort later. | |
| 1901 (unless (frame-live-p (selected-frame)) (kill-emacs nil)))) | |
| 1897 | 1902 |
| 1898 ;; If 3 or more files visited, and not all visible, | 1903 ;; If 3 or more files visited, and not all visible, |
| 1899 ;; show user what they all are. But leave the last one current. | 1904 ;; show user what they all are. But leave the last one current. |
| 1900 (and (> file-count 2) | 1905 (and (> file-count 2) |
| 1901 (not noninteractive) | 1906 (not noninteractive) |