Mercurial > emacs
changeset 25739:a4321ad412ba
(Fset_window_buffer): Remove unused variables.
(Fset_window_margins): Ditto.
(window_fixed_size_p): Check window's height_fixed_p
flag.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Thu, 16 Sep 1999 12:52:22 +0000 |
| parents | 4b5b9289f6d8 |
| children | 68659a16bc42 |
| files | src/window.c |
| diffstat | 1 files changed, 20 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/window.c Thu Sep 16 12:52:20 1999 +0000 +++ b/src/window.c Thu Sep 16 12:52:22 1999 +0000 @@ -1967,22 +1967,27 @@ } else if (BUFFERP (w->buffer)) { - Lisp_Object val; - struct buffer *old = current_buffer; - - current_buffer = XBUFFER (w->buffer); - val = find_symbol_value (Qwindow_size_fixed); - current_buffer = old; - - fixed_p = 0; - if (!EQ (val, Qunbound)) + if (w->height_fixed_p && !width_p) + fixed_p = 1; + else { - fixed_p = !NILP (val); - - if (fixed_p - && ((EQ (val, Qheight) && width_p) - || (EQ (val, Qwidth) && !width_p))) - fixed_p = 0; + struct buffer *old = current_buffer; + Lisp_Object val; + + current_buffer = XBUFFER (w->buffer); + val = find_symbol_value (Qwindow_size_fixed); + current_buffer = old; + + fixed_p = 0; + if (!EQ (val, Qunbound)) + { + fixed_p = !NILP (val); + + if (fixed_p + && ((EQ (val, Qheight) && width_p) + || (EQ (val, Qwidth) && !width_p))) + fixed_p = 0; + } } /* Can't tell if this one is resizable without looking at @@ -2404,7 +2409,6 @@ { register Lisp_Object tem; register struct window *w = decode_window (window); - struct buffer *b; buffer = Fget_buffer (buffer); CHECK_BUFFER (buffer, 1); @@ -4585,7 +4589,6 @@ Lisp_Object window, left, right; { struct window *w = decode_window (window); - struct frame *f = XFRAME (w->frame); if (!NILP (left)) CHECK_NUMBER_OR_FLOAT (left, 1);