Mercurial > hg > xemacs-beta
view lwlib/lwlib-fonts.h @ 5139:a48ef26d87ee
Clean up prototypes for Lisp variables/symbols. Put decls for them with
the other stuff related to the file they're in. In the process, fix a few
places with incorrect initialization of symbols and variables.
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-03-12 Ben Wing <ben@xemacs.org>
* lisp.h:
* lisp.h (redo-symbols): Removed.
Put the Lisp variables and symbols where they belong, with other
stuff related to the file they're in.
* event-Xt.c (THIS_IS_X):
* event-Xt.c (syms_of_event_Xt):
* event-Xt.c (reinit_vars_of_event_Xt):
* event-gtk.c:
* event-gtk.c (syms_of_event_gtk):
* event-gtk.c (reinit_vars_of_event_gtk):
* event-stream.c:
* event-stream.c (syms_of_event_stream):
* event-stream.c (reinit_vars_of_event_stream):
* events.c (reinit_vars_of_events):
* events.c (vars_of_events):
`sans-modifiers' was defsymbol'ed more than once. Move it to
events-stream.c. `self-insert-command' was defsymbol'ed more than once.
Vevent_resource should be staticpro_nodump()ed as it's declared in
a reinit_*() method.
* lread.c (vars_of_lread):
Vfile_domain wasn't staticpro'ed.
* minibuf.c:
* minibuf.c (reinit_complex_vars_of_minibuf):
Vminibuffer_zero and Vecho_area_buffer weren't staticpro'ed.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 12 Mar 2010 20:23:50 -0600 |
| parents | a6c778975d7d |
| children | 308d34e9f07d |
line wrap: on
line source
/* Font data structures for X and Xft. Copyright (C) 2004 Free Software Foundation, Inc. Author: Stephen J. Turnbull <stephen@xemacs.org> Created: 24 Jul 2004 by Stephen J. Turnbull This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in GNU Emacs. */ #ifndef INCLUDED_lwlib_fonts_h_ #define INCLUDED_lwlib_fonts_h_ /* get headers */ #ifdef HAVE_XFT #define _XFT_NO_COMPAT_ /* shut up GCC */ #define face_index face_index_arg #define glyph_index glyph_index_arg #include <X11/Xft/Xft.h> #undef glyph_index #undef face_index #if XFT_MAJOR < 2 #error Xft versions < 2 not supported #endif #endif /* HAVE_XFT */ /* Xt name macros */ #ifdef HAVE_XFT #ifndef XtNxftFont #define XtNxftFont "xftFont" #define XtCXftFont "XftFont" #endif #ifndef XtNfcFont #define XtNfcFontName "fcFontName" #define XtCFcFontName "FcFontName" #endif #endif /* HAVE_XFT */ /* code 'n' stuff */ #ifdef HAVE_XFT #define FCSTRLEN 512 /* non-Lisp prototypes */ /* #### change this back to _open_name */ XftFont *xft_open_font_by_name (Display *dpy, char *name); #endif /* HAVE_XFT */ #endif /* INCLUDED_lwlib_fonts_h_ */