comparison src/faces.c @ 120:cca96a509cfe r20-1b12

Import from CVS: tag r20-1b12
author cvs
date Mon, 13 Aug 2007 09:25:29 +0200
parents 9f59509498e1
children 8eaf7971accc
comparison
equal deleted inserted replaced
119:d101af7320b8 120:cca96a509cfe
44 #ifdef HAVE_X_WINDOWS 44 #ifdef HAVE_X_WINDOWS
45 #include "console-x.h" 45 #include "console-x.h"
46 #include "objects-x.h" 46 #include "objects-x.h"
47 #include "EmacsFrame.h" 47 #include "EmacsFrame.h"
48 #endif /* HAVE_X_WINDOWS */ 48 #endif /* HAVE_X_WINDOWS */
49
50 #ifdef HAVE_NEXTSTEP
51 #include "console-ns.h"
52 #include "objects-ns.h"
53 #endif /* HAVE_NEXTSTEP */
54 49
55 /* Qfont, Qdoc_string, Qface defined in general.c */ 50 /* Qfont, Qdoc_string, Qface defined in general.c */
56 Lisp_Object Qfacep; 51 Lisp_Object Qfacep;
57 Lisp_Object Qforeground, Qbackground, Qdisplay_table; 52 Lisp_Object Qforeground, Qbackground, Qdisplay_table;
58 /* Qhighlight, Qreverse defined in general.c */ 53 /* Qhighlight, Qreverse defined in general.c */
1672 make_int (frm->height), 1667 make_int (frm->height),
1673 Qnil); 1668 Qnil);
1674 } 1669 }
1675 } 1670 }
1676 #endif /* HAVE_X_WINDOWS */ 1671 #endif /* HAVE_X_WINDOWS */
1677
1678 #ifdef HAVE_NEXTSTEP
1679 if (FRAME_NS_P (frm))
1680 {
1681 /* This code still needs to be written */
1682 }
1683 #endif /* HAVE_NEXSTEP */
1684 } 1672 }
1685 1673
1686 static void 1674 static void
1687 update_EmacsFrames (Lisp_Object locale, Lisp_Object name) 1675 update_EmacsFrames (Lisp_Object locale, Lisp_Object name)
1688 { 1676 {