Mercurial > hg > xemacs-beta

comparison src/glyphs-widget.c @ 458:c33ae14dd6d0 r21-2-44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-44
author cvs
date Mon, 13 Aug 2007 11:42:25 +0200
parents d7a9135ec789
children 183866b06e0b
comparison
equal deleted inserted replaced
457:4b9290a33024 458:c33ae14dd6d0
148 } 148 }
149 149
150 static void 150 static void
151 check_valid_int_or_function (Lisp_Object data) 151 check_valid_int_or_function (Lisp_Object data)
152 { 152 {
153 if (!INTP (data) && !CONSP (data)) 153 if (!INTP (data) && !CONSP (data) && !SYMBOLP (data))
154 invalid_argument ("must be an integer or expresssion", data); 154 invalid_argument ("must be an integer or expresssion", data);
155 } 155 }
156 156
157 static void 157 static void
158 check_valid_symbol (Lisp_Object data) 158 check_valid_symbol (Lisp_Object data)
1019 else 1019 else
1020 { 1020 {
1021 /* Instantiate any new glyphs. */ 1021 /* Instantiate any new glyphs. */
1022 for (; !NILP (items); items = XCDR (items)) 1022 for (; !NILP (items); items = XCDR (items))
1023 { 1023 {
1024 /* #### We really want to use call_with_suspended_errors
1025 here, but it won't allow us to call lisp. */
1024 border = Fcons (call1 (Qmake_glyph, XCAR (items)), border); 1026 border = Fcons (call1 (Qmake_glyph, XCAR (items)), border);
1025 } 1027 }
1026 IMAGE_INSTANCE_LAYOUT_CHILDREN (ii) = Fnreverse (border); 1028 IMAGE_INSTANCE_LAYOUT_CHILDREN (ii) = Fnreverse (border);
1027 } 1029 }
1028 } 1030 }