Mercurial > hg > xemacs-beta

comparison src/glyphs-shared.c @ 4226:9b4442ac18c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2007-10-15 09:55:43 by didierv] Fix image specifiers related bugs
author didierv
date Mon, 15 Oct 2007 09:55:50 +0000
parents ecf1ebac70d8
children b3ea9c582280
comparison
equal deleted inserted replaced
4225:e358b6c40407 4226:9b4442ac18c7
1 /* Routines shared between window-system backends for glyph objects. 1 /* Routines shared between window-system backends for glyph objects.
2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc.
3 Copyright (C) 1995 Board of Trustees, University of Illinois. 3 Copyright (C) 1995 Board of Trustees, University of Illinois
4 Copyright (C) 1995 Tinker Systems 4 Copyright (C) 1995 Tinker Systems
5 Copyright (C) 1995, 1996, 2001 Ben Wing 5 Copyright (C) 1995, 1996, 2001 Ben Wing
6 Copyright (C) 1995 Sun Microsystems 6 Copyright (C) 1995 Sun Microsystems
7 Copyright (C) 1998, 1999, 2000 Andy Piper. 7 Copyright (C) 1998, 1999, 2000 Andy Piper
8 8
9 This file is part of XEmacs. 9 This file is part of XEmacs.
10 10
11 XEmacs is free software; you can redistribute it and/or modify it 11 XEmacs is free software; you can redistribute it and/or modify it
12 under the terms of the GNU General Public License as published by the 12 under the terms of the GNU General Public License as published by the
73 GCPRO2 (file, alist); 73 GCPRO2 (file, alist);
74 74
75 file = potential_pixmap_file_instantiator (inst, Q_file, Q_data, 75 file = potential_pixmap_file_instantiator (inst, Q_file, Q_data,
76 console_type); 76 console_type);
77 77
78 if (NILP (file)) /* normalization impossible for the console type */
79 RETURN_UNGCPRO (Qnil);
80
78 if (CONSP (file)) /* failure locating filename */ 81 if (CONSP (file)) /* failure locating filename */
79 signal_double_image_error ("Opening pixmap file", 82 signal_double_image_error ("Opening pixmap file",
80 "no such file or directory", 83 "no such file or directory",
81 Fcar (file)); 84 Fcar (file));
82 85
83 if (NILP (file)) /* no conversion necessary */ 86 if (EQ (file, Qt)) /* no conversion necessary */
84 RETURN_UNGCPRO (inst); 87 RETURN_UNGCPRO (inst);
85 88
86 alist = tagged_vector_to_alist (inst); 89 alist = tagged_vector_to_alist (inst);
87 90
88 { 91 {