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

Diff of /emacs/src/frame.c

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

revision 1.270 by pj, Sun Oct 21 07:27:56 2001 UTC revision 1.271 by gerd, Thu Oct 25 15:44:11 2001 UTC
# Line 2085  If FRAME is nil, describe the currently Line 2085  If FRAME is nil, describe the currently
2085        else if (EQ (parameter, Qdisplay) && FRAME_X_P (f))        else if (EQ (parameter, Qdisplay) && FRAME_X_P (f))
2086          value = XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element);          value = XCAR (FRAME_X_DISPLAY_INFO (f)->name_list_element);
2087  #endif /* HAVE_X_WINDOWS */  #endif /* HAVE_X_WINDOWS */
2088        else        else if (EQ (parameter, Qbackground_color)
2089                   || EQ (parameter, Qforeground_color))
2090          {          {
2091            value = Fassq (parameter, f->param_alist);            value = Fassq (parameter, f->param_alist);
2092            if (CONSP (value))            if (CONSP (value))
# Line 2120  If FRAME is nil, describe the currently Line 2121  If FRAME is nil, describe the currently
2121                      }                      }
2122                  }                  }
2123              }              }
           else if (EQ (parameter, Qdisplay_type)  
                    || EQ (parameter, Qbackground_mode))  
             /* Avoid consing in frequent cases.  */  
             value = Qnil;  
           else  
             value = Fcdr (Fassq (parameter, Fframe_parameters (frame)));  
2124          }          }
2125          else if (EQ (parameter, Qdisplay_type)
2126                   || EQ (parameter, Qbackground_mode))
2127            /* Avoid consing in frequent cases.  */
2128            value = Fcdr (Fassq (parameter, f->param_alist));
2129          else
2130            value = Fcdr (Fassq (parameter, Fframe_parameters (frame)));
2131      }      }
2132        
2133    return value;    return value;

Legend:
Removed from v.1.270  
changed lines
  Added in v.1.271

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