/[emacs]/emacs/src/window.c
ViewVC logotype

Diff of /emacs/src/window.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.515 by kfstorm, Tue Aug 16 14:58:33 2005 UTC revision 1.516 by schwab, Sun Sep 18 16:28:53 2005 UTC
# Line 273  make_window () Line 273  make_window ()
273    XSETWINDOW (val, p);    XSETWINDOW (val, p);
274    XSETFASTINT (p->last_point, 0);    XSETFASTINT (p->last_point, 0);
275    p->frozen_window_start_p = 0;    p->frozen_window_start_p = 0;
   p->height_fixed_p = 0;  
276    p->last_cursor_off_p = p->cursor_off_p = 0;    p->last_cursor_off_p = p->cursor_off_p = 0;
277    p->left_margin_cols = Qnil;    p->left_margin_cols = Qnil;
278    p->right_margin_cols = Qnil;    p->right_margin_cols = Qnil;
# Line 2438  window_fixed_size_p (w, width_p, check_s Line 2437  window_fixed_size_p (w, width_p, check_s
2437      }      }
2438    else if (BUFFERP (w->buffer))    else if (BUFFERP (w->buffer))
2439      {      {
2440        if (w->height_fixed_p && !width_p)        struct buffer *old = current_buffer;
2441          fixed_p = 1;        Lisp_Object val;
       else  
         {  
           struct buffer *old = current_buffer;  
           Lisp_Object val;  
2442    
2443            current_buffer = XBUFFER (w->buffer);        current_buffer = XBUFFER (w->buffer);
2444            val = find_symbol_value (Qwindow_size_fixed);        val = find_symbol_value (Qwindow_size_fixed);
2445            current_buffer = old;        current_buffer = old;
2446    
2447            fixed_p = 0;        fixed_p = 0;
2448            if (!EQ (val, Qunbound))        if (!EQ (val, Qunbound))
2449              {          {
2450                fixed_p = !NILP (val);            fixed_p = !NILP (val);
2451    
2452                if (fixed_p            if (fixed_p
2453                    && ((EQ (val, Qheight) && width_p)                && ((EQ (val, Qheight) && width_p)
2454                        || (EQ (val, Qwidth) && !width_p)))                    || (EQ (val, Qwidth) && !width_p)))
2455                  fixed_p = 0;              fixed_p = 0;
             }  
2456          }          }
2457    
2458        /* Can't tell if this one is resizable without looking at        /* Can't tell if this one is resizable without looking at

Legend:
Removed from v.1.515  
changed lines
  Added in v.1.516

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26