APPROVE COMMIT 21.5 Thanks for the reminder, Jerry! Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.927 diff -u -U0 -r1.927 ChangeLog --- ChangeLog 14 Mar 2006 19:31:41 -0000 1.927 +++ ChangeLog 17 Mar 2006 14:25:20 -0000 ＠＠ -0,0 +1,5 ＠＠ +2006-03-17 Stephen J. Turnbull <stephen(a)xemacs.org&gt; + + * objects-x.c (x_font_instance_truename): + Eliminate bogus pointer to nowhere. + Index: objects-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v retrieving revision 1.36 diff -u -r1.36 objects-x.c --- objects-x.c 20 Jan 2006 17:50:46 -0000 1.36 +++ objects-x.c 17 Mar 2006 14:25:26 -0000 ＠＠ -794,7 +794,6 ＠＠ struct device *d = XDEVICE (f->device); Display *dpy = DEVICE_X_DISPLAY (d); Extbyte *nameext; - char* xlfd; /* #### restructure this so that we return a valid truename at the end, and otherwise only return when we return something desperate that ＠＠ -827,9 +826,7 ＠＠ if (NILP (FONT_INSTANCE_TRUENAME (f)) && FONT_INSTANCE_X_FONT (f)) { - nameext = &xlfd[0]; - LISP_STRING_TO_EXTERNAL (f->name, nameext, Qx_font_name_encoding); - + nameext = NEW_LISP_STRING_TO_EXTERNAL (f->name, Qx_font_name_encoding); FONT_INSTANCE_TRUENAME (f) = x_font_truename (dpy, nameext, FONT_INSTANCE_X_FONT (f)); } -- Graduate School of Systems and Information Engineering University of Tsukuba http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Economics of Information Communication and Computation Systems Experimental Economics, Microeconomic Theory, Game Theory