cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings) -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-02-08 Ben Wing <ben@xemacs.org> * faces.c: * faces.c (face_property_matching_instance): * faces.c (ensure_face_cachel_contains_charset): * faces.h (FACE_FONT): * lisp.h: * lisp.h (enum font_specifier_matchspec_stages): * objects-msw.c: * objects-msw.c (mswindows_font_spec_matches_charset): * objects-msw.c (mswindows_find_charset_font): * objects-tty.c: * objects-tty.c (tty_font_spec_matches_charset): * objects-tty.c (tty_find_charset_font): * objects-xlike-inc.c: * objects-xlike-inc.c (XFUN): * objects-xlike-inc.c (xft_find_charset_font): * objects.c: * objects.c (font_instantiate): * objects.c (FROB): * specifier.c: * specifier.c (charset_matches_specifier_tag_set_p): * specifier.c (call_charset_predicate): * specifier.c (define_specifier_tag): * specifier.c (Fdefine_specifier_tag): * specifier.c (setup_charset_initial_specifier_tags): * specifier.c (specifier_instance_from_inst_list): * specifier.c (FROB): * specifier.c (vars_of_specifier): * specifier.h: Rename the specifier-font-matching stages in preparation for eliminating shadowed warnings, some other related fixes from ben-unicode-internal. 1. Rename raw enums: initial -> STAGE_INITIAL final -> STAGE_FINAL impossible -> NUM_MATCHSPEC_STAGES 2. Move `enum font_specifier_matchspec_stages' from specifier.h to lisp.h. 3. Whitespace changes to match coding standards. 4. Eliminate unused second argument STAGE in charset predicates that don't use it -- the code that calls the charset predicates is now smart enough to supply the right number of arguments automatically. 5. Add some long(ish) comments and authorial notices, esp. in objects.c. 6. In specifier.c, change Vcharset_tag_lists from a vector over leading bytes to a hash table over charsets. This change is unnecessary currently but doesn't hurt and will be required when we merge in Unicode-internal. 7. In specifier.c, extract out the code that calls charset predicates into a function call_charset_predicate().

##   Makefile for the sample module in XEmacs.
##   Copyright (C) 2002 Jerry James.
##
##   This sample Makefile is free; 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.

## This file is not part of XEmacs.

### Specialize this part for your module
MODNAME=sample
MODVER=0.0.1
MODTITLE="Sample module for XEmacs"
SRCS=sample.c

### You should not need to modify anything below this line
SHELL=/bin/sh
RM=rm -f
CFLAGS=@CFLAGS@
LDFLAGS=@LDFLAGS@

srcdir=@srcdir@
VPATH=@srcdir@

SRC_SRCS=$(SRCS:%=$(srcdir)/%)
OBJS=$(SRCS:.c=.o)

ELLCC=@ELLCC@
MODARCHDIR=$(shell @ELLCC@ --mod-archdir)
INSTALLPATH=$(shell @ELLCC@ --mod-site-location)
INSTALL=@INSTALL@
INSTALL_PROGRAM=@INSTALL_PROGRAM@

.PHONY:	clean distclean install
all: $(MODNAME).ell

.c.o:
	$(ELLCC) $(CFLAGS) --mode=compile --mod-output=$@ \
	-I$(MODARCHDIR)/include -c $<

$(MODNAME).ell: $(OBJS) $(MODNAME)_i.o
	$(ELLCC) --mode=link --mod-output=$@ $(OBJS) $(MODNAME)_i.o $(LDFLAGS)

$(MODNAME)_i.c: $(SRCS)
	ELLMAKEDOC=$(MODARCHDIR)/make-docfile $(ELLCC) --mode=init \
	--mod-output=$@ --mod-name=$(MODNAME) --mod-version=$(MODVER) \
	--mod-title=$(MODTITLE) $(SRC_SRCS)

clean:
	$(RM) $(MODNAME).ell $(OBJS) $(MODNAME)_i.* *~

distclean: clean
	$(RM) Makefile config.* configure

install: $(MODNAME).ell
	$(INSTALL_PROGRAM) $< $(INSTALLPATH)