Mercurial > emacs
changeset 3535:581c09f72dbd
(Fset_window_configuration): If a window is supposed
to have a buffer, always give it one.
(syms_of_window): Always defvar pop-up-frames
and pop-up-frame-function.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 07 Jun 1993 05:29:40 +0000 |
| parents | 2323f2160053 |
| children | 58d5ee6ec253 |
| files | src/window.c |
| diffstat | 1 files changed, 3 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/window.c Mon Jun 07 05:28:42 1993 +0000 +++ b/src/window.c Mon Jun 07 05:29:40 1993 +0000 @@ -2569,8 +2569,8 @@ XBUFFER (p->buffer) == current_buffer) Fgoto_char (w->pointm); } - else if (NILP (XBUFFER (w->buffer)->name)) - /* Else if window's old buffer is dead too, get a live one. */ + else if (NILP (w->buffer) || NILP (XBUFFER (w->buffer)->name)) + /* Else unless window has a live buffer, get one. */ { w->buffer = Fcdr (Fcar (Vbuffer_alist)); /* This will set the markers to beginning of visible @@ -2581,8 +2581,7 @@ } else /* Keeping window's old buffer; make sure the markers - are real. Else if window's old buffer is dead too, - get a live one. */ + are real. */ { /* Set window markers at start of visible range. */ if (XMARKER (w->start)->buffer == 0) @@ -2900,7 +2899,6 @@ "If non-nil, this is a buffer and \\[scroll-other-window] should scroll its window."); Vother_window_scroll_buffer = Qnil; -#ifdef MULTI_FRAME DEFVAR_BOOL ("pop-up-frames", &pop_up_frames, "*Non-nil means `display-buffer' should make a separate frame."); pop_up_frames = 0; @@ -2912,7 +2910,6 @@ A typical value might be `(lambda () (new-frame pop-up-frame-alist))'\n\ where `pop-up-frame-alist' would hold the default frame parameters."); Vpop_up_frame_function = Qnil; -#endif DEFVAR_BOOL ("pop-up-windows", &pop_up_windows, "*Non-nil means display-buffer should make new windows.");