Mercurial > emacs
comparison src/window.c @ 39958:47a9547923c8
(window_loop): Don't check for Fother_buffer returning nil.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Mon, 15 Oct 2001 11:38:41 +0000 |
| parents | 3a1666ed16b8 |
| children | 6b389fb978bc |
comparison
equal
deleted
inserted
replaced
| 39957:a32cf399f143 | 39958:47a9547923c8 |
|---|---|
| 1852 /* If we're deleting the buffer displayed in the | 1852 /* If we're deleting the buffer displayed in the |
| 1853 only window on the frame, find a new buffer to | 1853 only window on the frame, find a new buffer to |
| 1854 display there. */ | 1854 display there. */ |
| 1855 Lisp_Object buffer; | 1855 Lisp_Object buffer; |
| 1856 buffer = Fother_buffer (obj, Qnil, w->frame); | 1856 buffer = Fother_buffer (obj, Qnil, w->frame); |
| 1857 if (NILP (buffer)) | |
| 1858 buffer = Fget_buffer_create (build_string ("*scratch*")); | |
| 1859 Fset_window_buffer (window, buffer); | 1857 Fset_window_buffer (window, buffer); |
| 1860 if (EQ (window, selected_window)) | 1858 if (EQ (window, selected_window)) |
| 1861 Fset_buffer (w->buffer); | 1859 Fset_buffer (w->buffer); |
| 1862 } | 1860 } |
| 1863 else | 1861 else |
| 1889 Lisp_Object buffer; | 1887 Lisp_Object buffer; |
| 1890 struct frame *f = XFRAME (w->frame); | 1888 struct frame *f = XFRAME (w->frame); |
| 1891 | 1889 |
| 1892 /* Find another buffer to show in this window. */ | 1890 /* Find another buffer to show in this window. */ |
| 1893 buffer = Fother_buffer (obj, Qnil, w->frame); | 1891 buffer = Fother_buffer (obj, Qnil, w->frame); |
| 1894 if (NILP (buffer)) | |
| 1895 buffer = Fget_buffer_create (build_string ("*scratch*")); | |
| 1896 | 1892 |
| 1897 /* If this window is dedicated, and in a frame of its own, | 1893 /* If this window is dedicated, and in a frame of its own, |
| 1898 kill the frame. */ | 1894 kill the frame. */ |
| 1899 if (EQ (window, FRAME_ROOT_WINDOW (f)) | 1895 if (EQ (window, FRAME_ROOT_WINDOW (f)) |
| 1900 && !NILP (w->dedicated) | 1896 && !NILP (w->dedicated) |