mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-29 00:31:01 -08:00
Code Issues Projects Releases Wiki Activity

(Fset_window_buffer): Remove unused variables.

Browse source 
(Fset_window_margins): Ditto.
(window_fixed_size_p): Check window's height_fixed_p
flag.
This commit is contained in:
Gerd Moellmann 1999-09-16 12:52:22 +00:00
parent 13c67cc645
commit a34dfd12cc
1 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/window.c
View file

@ -1967,22 +1967,27 @@ window_fixed_size_p (w, width_p, check_siblings_p)
}
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 @@ BUFFER can be a buffer or buffer name.")
{
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 @@ A nil width parameter means no margin.")
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);