Mercurial > hg > xemacs-beta
diff src/glyphs.c @ 2526:902d5bd9b75c
[xemacs-hg @ 2005-01-28 02:36:11 by ben]
Support symlinks under Windows
nt.c, fileio.c: Fix sync comments.
config.h.in, dired-msw.c, emacs.c, event-msw.c, fileio.c, glyphs.c, lisp.h, nt.c, process-nt.c, realpath.c, sound.c, symsinit.h, sysdep.c, sysfile.h, syswindows.h, win32.c: Add support for treating shortcuts under Windows as symbolic links.
Enabled with mswindows-shortcuts-are-links (t by default). Rewrite
lots of places to use PATHNAME_CONVERT_OUT, which is moved to
sysfile.h. Add PATHNAME_RESOLVE_LINKS, which only does things
under Windows.
Add profiling section for expand_file_name calls.
nt.c, sysdep.c: Unicode-ize.
realpath.c: Renamed from readlink_and_correct_case. Fix some problems with
Windows implementation due to incorrect understanding of workings
of the function.
sound.c, ntplay.c, sound.h: Rename play_sound_file to nt_play_sound_file and pass
internally-formatted data to it to avoid converting out and back
again.
text.h: is_c -> is_ascii.
author | ben |
---|---|
date | Fri, 28 Jan 2005 02:36:28 +0000 |
parents | 3d8143fc88e1 |
children | 9f70af3ac939 |
line wrap: on
line diff
--- a/src/glyphs.c Fri Jan 28 02:05:05 2005 +0000 +++ b/src/glyphs.c Fri Jan 28 02:36:28 2005 +0000 @@ -1,7 +1,7 @@ /* Generic glyph/image implementation + display tables Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1995 Tinker Systems - Copyright (C) 1995, 1996, 2000, 2001, 2002 Ben Wing + Copyright (C) 1995, 1996, 2000, 2001, 2002, 2004 Ben Wing Copyright (C) 1995 Sun Microsystems Copyright (C) 1998, 1999, 2000 Andy Piper @@ -2917,11 +2917,13 @@ Lisp_Object pixmap_to_lisp_data (Lisp_Object name, int ok_if_data_invalid) { - char **data; + Ascbyte **data; int result; - char *fname = 0; - - LISP_STRING_TO_EXTERNAL (name, fname, Qfile_name); + Extbyte *fname = 0; + Ibyte *resolved; + + LISP_PATHNAME_RESOLVE_LINKS (name, resolved); + C_STRING_TO_EXTERNAL (resolved, fname, Qfile_name); result = XpmReadFileToData (fname, &data); if (result == XpmSuccess)