HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix EDE security flaw involving loading arbitrary Lisp from Project.ede.
[bpt/emacs.git]
/
lwlib
/
xlwmenuP.h
diff --git
a/lwlib/xlwmenuP.h
b/lwlib/xlwmenuP.h
index
2ecffc9
..
5decd56
100644
(file)
--- a/
lwlib/xlwmenuP.h
+++ b/
lwlib/xlwmenuP.h
@@
-1,7
+1,7
@@
/* Internals of a lightweight menubar widget.
/* Internals of a lightweight menubar widget.
+
+Copyright (C) 2002-2012 Free Software Foundation, Inc.
Copyright (C) 1992 Lucid, Inc.
Copyright (C) 1992 Lucid, Inc.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
This file is part of the Lucid Widget Library.
This file is part of the Lucid Widget Library.
@@
-59,11
+59,11
@@
typedef struct _XlwMenu_part
XFontSetExtents *font_extents;
#endif
#ifdef HAVE_XFT
XFontSetExtents *font_extents;
#endif
#ifdef HAVE_XFT
- String faceName;
int default_face;
XftFont* xft_font;
XftColor xft_fg, xft_bg, xft_disabled_fg;
#endif
int default_face;
XftFont* xft_font;
XftColor xft_fg, xft_bg, xft_disabled_fg;
#endif
+ String fontName;
XFontStruct* font;
Pixel foreground;
Pixel disabled_foreground;
XFontStruct* font;
Pixel foreground;
Pixel disabled_foreground;
@@
-142,5
+142,3
@@
extern XlwMenuClassRec xlwMenuClassRec;
#endif /* _XlwMenuP_h */
#endif /* _XlwMenuP_h */
-/* arch-tag: 18d7fc41-ffa0-47a3-a49f-3469900c7a25
- (do not change this comment) */