Mercurial > hg > xemacs-beta
view src/fontcolor.h @ 5277:d804e621add0
Simplify the API of PARSE_KEYWORDS for callers.
src/ChangeLog addition:
2010-09-18 Aidan Kehoe <kehoea@parhasard.net>
Simplify the API of PARSE_KEYWORDS for callers.
* lisp.h (PARSE_KEYWORDS): Simply the API, while making the
implementation a little more complex; work out KEYWORDS_OFFSET
from the appropriate Lisp_Subr struct, take the function name as
the C name of the DEFUN rather than a symbol visible as a
Lisp_Object, on debug builds assert that we're actually in the
function so we choke on badly-done copy-and-pasting,
* lisp.h (PARSE_KEYWORDS_8): New. This is the old PARSE_KEYWORDS.
* fns.c (Fmerge, FsortX, Ffill, Freduce, Freplace):
Change to use the new PARSE_KEYWORDS syntax.
* elhash.c (Fmake_hash_table): Chance to the new PARSE_KEYWORDS
syntax, rename a define to correspond to what other files use.
* symbols.c (intern_massaging_name):
* buffer.c (ADD_INT):
Rename intern_converting_underscores_to_dashes() to
intern_massaging_name(), now it does a little more.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 18 Sep 2010 15:57:20 +0100 |
parents | 97eb4942aec8 |
children | 308d34e9f07d |
line wrap: on
line source
/* Generic object functions -- interface. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995, 1996, 2002, 2010 Ben Wing. 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 FSF. */ #ifndef INCLUDED_fontcolor_h_ #define INCLUDED_fontcolor_h_ DECLARE_DOESNT_RETURN (finalose (void *ptr)); /**************************************************************************** * Color Instance Object * ****************************************************************************/ DECLARE_LISP_OBJECT (color_instance, Lisp_Color_Instance); #define XCOLOR_INSTANCE(x) XRECORD (x, color_instance, Lisp_Color_Instance) #define wrap_color_instance(p) wrap_record (p, color_instance) #define COLOR_INSTANCEP(x) RECORDP (x, color_instance) #define CHECK_COLOR_INSTANCE(x) CHECK_RECORD (x, color_instance) #define CONCHECK_COLOR_INSTANCE(x) CONCHECK_RECORD (x, color_instance) EXFUN (Fmake_color_instance, 3); extern Lisp_Object Vthe_null_color_instance; void set_color_attached_to (Lisp_Object obj, Lisp_Object face, Lisp_Object property); /**************************************************************************** * Font Instance Object * ****************************************************************************/ void initialize_charset_font_caches (struct device *d); void invalidate_charset_font_caches (Lisp_Object charset); DECLARE_LISP_OBJECT (font_instance, Lisp_Font_Instance); #define XFONT_INSTANCE(x) XRECORD (x, font_instance, Lisp_Font_Instance) #define wrap_font_instance(p) wrap_record (p, font_instance) #define FONT_INSTANCEP(x) RECORDP (x, font_instance) #define CHECK_FONT_INSTANCE(x) CHECK_RECORD (x, font_instance) #define CONCHECK_FONT_INSTANCE(x) CONCHECK_RECORD (x, font_instance) EXFUN (Fmake_font_instance, 4); EXFUN (Ffont_instance_name, 1); EXFUN (Ffont_instance_p, 1); EXFUN (Ffont_instance_truename, 1); EXFUN (Ffont_instance_charset, 1); extern Lisp_Object Vthe_null_font_instance; void set_font_attached_to (Lisp_Object obj, Lisp_Object face, Lisp_Object property); /***************************************************************************** * Face Boolean Specifier Object * *****************************************************************************/ void set_face_boolean_attached_to (Lisp_Object obj, Lisp_Object face, Lisp_Object property); /***************************************************************************** * Face Background Placement Specifier Object * *****************************************************************************/ void set_face_background_placement_attached_to (Lisp_Object obj, Lisp_Object face); #endif /* INCLUDED_fontcolor_h_ */