comparison src/glyphs.c @ 16:0293115a14e9 r19-15b91

Import from CVS: tag r19-15b91
author cvs
date Mon, 13 Aug 2007 08:49:20 +0200
parents 9ee227acff29
children 859a2309aef8
comparison
equal deleted inserted replaced
15:ad457d5f7d04 16:0293115a14e9
1058 (data, device, dest_types, no_error) 1058 (data, device, dest_types, no_error)
1059 Lisp_Object data, device, dest_types, no_error; 1059 Lisp_Object data, device, dest_types, no_error;
1060 { 1060 {
1061 Error_behavior errb = decode_error_behavior_flag (no_error); 1061 Error_behavior errb = decode_error_behavior_flag (no_error);
1062 1062
1063 return call_with_suspended_errors (make_image_instance_1, 1063 return call_with_suspended_errors ((lisp_fn_t) make_image_instance_1,
1064 Qnil, Qimage, errb, 1064 Qnil, Qimage, errb,
1065 3, data, device, dest_types); 1065 3, data, device, dest_types);
1066 } 1066 }
1067 1067
1068 DEFUN ("image-instance-p", Fimage_instance_p, Simage_instance_p, 1, 1, 0 /* 1068 DEFUN ("image-instance-p", Fimage_instance_p, Simage_instance_p, 1, 1, 0 /*
1355 /**************************************************************************** 1355 /****************************************************************************
1356 * nothing * 1356 * nothing *
1357 ****************************************************************************/ 1357 ****************************************************************************/
1358 1358
1359 static int 1359 static int
1360 nothing_possible_dest_types () 1360 nothing_possible_dest_types (void)
1361 { 1361 {
1362 return IMAGE_NOTHING_MASK; 1362 return IMAGE_NOTHING_MASK;
1363 } 1363 }
1364 1364
1365 static void 1365 static void
1397 inst = vector3 (Qinherit, Q_face, Fget_face (face)); 1397 inst = vector3 (Qinherit, Q_face, Fget_face (face));
1398 return inst; 1398 return inst;
1399 } 1399 }
1400 1400
1401 static int 1401 static int
1402 inherit_possible_dest_types () 1402 inherit_possible_dest_types (void)
1403 { 1403 {
1404 return IMAGE_MONO_PIXMAP_MASK; 1404 return IMAGE_MONO_PIXMAP_MASK;
1405 } 1405 }
1406 1406
1407 static void 1407 static void
1423 { 1423 {
1424 data_must_be_present (instantiator); 1424 data_must_be_present (instantiator);
1425 } 1425 }
1426 1426
1427 static int 1427 static int
1428 string_possible_dest_types () 1428 string_possible_dest_types (void)
1429 { 1429 {
1430 return IMAGE_TEXT_MASK; 1430 return IMAGE_TEXT_MASK;
1431 } 1431 }
1432 1432
1433 /* called from autodetect_instantiate() */ 1433 /* called from autodetect_instantiate() */
1459 { 1459 {
1460 data_must_be_present (instantiator); 1460 data_must_be_present (instantiator);
1461 } 1461 }
1462 1462
1463 static int 1463 static int
1464 formatted_string_possible_dest_types () 1464 formatted_string_possible_dest_types (void)
1465 { 1465 {
1466 return IMAGE_TEXT_MASK; 1466 return IMAGE_TEXT_MASK;
1467 } 1467 }
1468 1468
1469 static void 1469 static void
1767 LIST_LOOP (rest, possible_console_types) 1767 LIST_LOOP (rest, possible_console_types)
1768 { 1768 {
1769 Lisp_Object newinst; 1769 Lisp_Object newinst;
1770 Lisp_Object contype = XCAR (rest); 1770 Lisp_Object contype = XCAR (rest);
1771 1771
1772 newinst = call_with_suspended_errors (normalize_image_instantiator, 1772 newinst = call_with_suspended_errors
1773 Qnil, Qimage, ERROR_ME_NOT, 1773 ((lisp_fn_t) normalize_image_instantiator,
1774 3, instantiator, contype, 1774 Qnil, Qimage, ERROR_ME_NOT, 3, instantiator, contype,
1775 make_int 1775 make_int (XIMAGE_SPECIFIER_ALLOWED (specifier)));
1776 (XIMAGE_SPECIFIER_ALLOWED 1776
1777 (specifier)));
1778 if (!NILP (newinst)) 1777 if (!NILP (newinst))
1779 { 1778 {
1780 Lisp_Object newtag; 1779 Lisp_Object newtag;
1781 if (NILP (memq_no_quit (contype, tag_set))) 1780 if (NILP (memq_no_quit (contype, tag_set)))
1782 newtag = Fcons (contype, tag_set); 1781 newtag = Fcons (contype, tag_set);