12:54 p.m.
NOTE: This patch has been committed.
APPROVE COMMIT sjt-xft
2005-02-09 Eric Knauel <eric(a)xemacs.org>
* xft-fonts.c (string_list_to_fcobjectset): Use loop macro instead
of for.
XEmacs Xft branch source patch:
Diff command: cvs -q diff -u
Files affected: src/xft-fonts.c
Index: src/xft-fonts.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/xft-fonts.c,v
retrieving revision 1.1.2.3
diff -u -u -r1.1.2.3 xft-fonts.c
--- src/xft-fonts.c 2005/02/04 16:05:38 1.1.2.3
+++ src/xft-fonts.c 2005/02/09 12:51:42
＠＠ -1003,12 +1003,10 ＠＠
static void
string_list_to_fcobjectset (Lisp_Object list, FcObjectSet *os)
{
- Lisp_Object i;
-
- for (i = list; !NILP (i); i = XCDR (i))
+ EXTERNAL_LIST_LOOP_2 (elt, list)
{
- CHECK_STRING (XCAR (i));
- FcObjectSetAdd (os, XSTRING_DATA (XCAR (i)));
+ CHECK_STRING (elt);
+ FcObjectSetAdd (os, XSTRING_DATA (elt));
}
}
-Eric
--
"Excuse me --- Di Du Du Duuuuh Di Dii --- Huh Weeeheeee" (Albert King)
8:58 p.m.
* Eric Knauel <knauel(a)informatik.uni-tuebingen.de> writes:
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/xft-fonts.c,v
Huh? Doesn't that mean that that is a deleted file (cvs rm)? Why is
a deleted file being patched?
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| In space, |
| No one can hear you rip a stinky |
|------------------------------------<steve(a)sxemacs.org>---|
9:01 p.m.
Steve Youngs <steve(a)sxemacs.org> wrote:
* Eric Knauel <knauel(a)informatik.uni-tuebingen.de> writes:
> RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/xft-fonts.c,v
Huh? Doesn't that mean that that is a deleted file (cvs rm)? Why is
a deleted file being patched?
Files are in the attic if they have been deleted from HEAD or have never
been added to HEAD. The latter is the case here. That file only exists
on a branch at the moment.
--
Jerry James
http://www.ittc.ku.edu/~james/
9:07 p.m.
* Jerry James <james(a)xemacs.org> writes:
Steve Youngs <steve(a)sxemacs.org> wrote:
> * Eric Knauel <knauel(a)informatik.uni-tuebingen.de> writes:
>
> > RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/xft-fonts.c,v
>
> Huh? Doesn't that mean that that is a deleted file (cvs rm)? Why is
> a deleted file being patched?
Files are in the attic if they have been deleted from HEAD or have
never been added to HEAD. The latter is the case here. That file
only exists on a branch at the moment.
Ah, OK. I hadn't thought of the latter case. Thanks for the
explanation.
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| In space, |
| No one can hear you rip a stinky |
|------------------------------------<steve(a)sxemacs.org>---|
3:29 a.m.
>>>> "Eric" == Eric Knauel
<knauel(a)informatik.uni-tuebingen.de> writes:
Eric> NOTE: This patch has been committed.
Thanks.
Something that may be undocumented is that the *LISP_LOOP* macros
declare variables, and therefore often need to be enclosed in a local
block:
{
EXTERNAL_LISP_LOOP_2 (elt, list)
{
do_stuff (elt, list);
}
do_something_with_last (elt);
}
The "do_something_with_last" part is why the MACRO can't include the
braces itself, that would cause `elt' to go out of scope.
--
Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
3:31 a.m.
Index: src/xft-fonts.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/xft-fonts.c,v
retrieving revision 1.1.2.3
diff -u -u -r1.1.2.3 xft-fonts.c
--- src/xft-fonts.c 2005/02/04 16:05:38 1.1.2.3
+++ src/xft-fonts.c 2005/02/09 12:51:42
＠＠ -1003,12 +1003,10 ＠＠
static void
string_list_to_fcobjectset (Lisp_Object list, FcObjectSet *os) {
- Lisp_Object i;
-
- for (i = list; !NILP (i); i = XCDR (i))
+ EXTERNAL_LIST_LOOP_2 (elt, list)
{
- CHECK_STRING (XCAR (i));
- FcObjectSetAdd (os, XSTRING_DATA (XCAR (i)));
+ CHECK_STRING (elt);
+ FcObjectSetAdd (os, XSTRING_DATA (elt));
}
}
BTW this code is not Mule-safe. You need to figure out what encoding
FcObjectSetAdd expects; I would guess:
FcObjectSetAdd (os, NEW_LISP_STRING_TO_EXTERNAL (elt, Qnative));
Same goes for every other place you are passing data from a Lisp string to
an external function.
4:34 a.m.
>>>> "Ben" == Ben Wing <ben(a)666.com>
writes:
Ben> FcObjectSetAdd (os, NEW_LISP_STRING_TO_EXTERNAL (elt, Qnative));
Qnative may be right, but it would be for the wrong reason. ISTR
these functions are documented to accept UTF-8 Unicode for all
external names, but in actual fact require ISO 8859-1 (probably
precisely because they're not doing any conversions themselves).
--
Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp
University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN
Ask not how you can "do" free software business;
ask what your business can "do for" free software.
7255
days inactive
7256
days old
6 comments
5 participants
participants (5)
-
Ben Wing -
Eric Knauel -
Jerry James -
Stephen J. Turnbull -
Steve Youngs