comparison src/glyphs.c @ 74:54cc21c15cbb r20-0b32

Import from CVS: tag r20-0b32
author cvs
date Mon, 13 Aug 2007 09:04:33 +0200
parents 131b0175ea99
children 6a378aca36af
comparison
equal deleted inserted replaced
73:e2d7a37b7c8d 74:54cc21c15cbb
1046 */ 1046 */
1047 (data, device, dest_types, no_error)) 1047 (data, device, dest_types, no_error))
1048 { 1048 {
1049 Error_behavior errb = decode_error_behavior_flag (no_error); 1049 Error_behavior errb = decode_error_behavior_flag (no_error);
1050 1050
1051 return call_with_suspended_errors (make_image_instance_1, 1051 return call_with_suspended_errors ((lisp_fn_t) make_image_instance_1,
1052 Qnil, Qimage, errb, 1052 Qnil, Qimage, errb,
1053 3, data, device, dest_types); 1053 3, data, device, dest_types);
1054 } 1054 }
1055 1055
1056 DEFUN ("image-instance-p", Fimage_instance_p, 1, 1, 0, /* 1056 DEFUN ("image-instance-p", Fimage_instance_p, 1, 1, 0, /*
1316 /**************************************************************************** 1316 /****************************************************************************
1317 * nothing * 1317 * nothing *
1318 ****************************************************************************/ 1318 ****************************************************************************/
1319 1319
1320 static int 1320 static int
1321 nothing_possible_dest_types () 1321 nothing_possible_dest_types (void)
1322 { 1322 {
1323 return IMAGE_NOTHING_MASK; 1323 return IMAGE_NOTHING_MASK;
1324 } 1324 }
1325 1325
1326 static void 1326 static void
1358 inst = vector3 (Qinherit, Q_face, Fget_face (face)); 1358 inst = vector3 (Qinherit, Q_face, Fget_face (face));
1359 return inst; 1359 return inst;
1360 } 1360 }
1361 1361
1362 static int 1362 static int
1363 inherit_possible_dest_types () 1363 inherit_possible_dest_types (void)
1364 { 1364 {
1365 return IMAGE_MONO_PIXMAP_MASK; 1365 return IMAGE_MONO_PIXMAP_MASK;
1366 } 1366 }
1367 1367
1368 static void 1368 static void
1384 { 1384 {
1385 data_must_be_present (instantiator); 1385 data_must_be_present (instantiator);
1386 } 1386 }
1387 1387
1388 static int 1388 static int
1389 string_possible_dest_types () 1389 string_possible_dest_types (void)
1390 { 1390 {
1391 return IMAGE_TEXT_MASK; 1391 return IMAGE_TEXT_MASK;
1392 } 1392 }
1393 1393
1394 /* called from autodetect_instantiate() */ 1394 /* called from autodetect_instantiate() */
1420 { 1420 {
1421 data_must_be_present (instantiator); 1421 data_must_be_present (instantiator);
1422 } 1422 }
1423 1423
1424 static int 1424 static int
1425 formatted_string_possible_dest_types () 1425 formatted_string_possible_dest_types (void)
1426 { 1426 {
1427 return IMAGE_TEXT_MASK; 1427 return IMAGE_TEXT_MASK;
1428 } 1428 }
1429 1429
1430 static void 1430 static void
1728 LIST_LOOP (rest, possible_console_types) 1728 LIST_LOOP (rest, possible_console_types)
1729 { 1729 {
1730 Lisp_Object newinst; 1730 Lisp_Object newinst;
1731 Lisp_Object contype = XCAR (rest); 1731 Lisp_Object contype = XCAR (rest);
1732 1732
1733 newinst = call_with_suspended_errors (normalize_image_instantiator, 1733 newinst = call_with_suspended_errors
1734 Qnil, Qimage, ERROR_ME_NOT, 1734 ((lisp_fn_t) normalize_image_instantiator,
1735 3, instantiator, contype, 1735 Qnil, Qimage, ERROR_ME_NOT, 3, instantiator, contype,
1736 make_int 1736 make_int (XIMAGE_SPECIFIER_ALLOWED (specifier)));
1737 (XIMAGE_SPECIFIER_ALLOWED 1737
1738 (specifier)));
1739 if (!NILP (newinst)) 1738 if (!NILP (newinst))
1740 { 1739 {
1741 Lisp_Object newtag; 1740 Lisp_Object newtag;
1742 if (NILP (memq_no_quit (contype, tag_set))) 1741 if (NILP (memq_no_quit (contype, tag_set)))
1743 newtag = Fcons (contype, tag_set); 1742 newtag = Fcons (contype, tag_set);