Mercurial > hg > xemacs-beta

comparison src/glyphs.c @ 14:9ee227acff29 r19-15b90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b90
author cvs
date Mon, 13 Aug 2007 08:48:42 +0200
parents 376386a54a3c
children 0293115a14e9
comparison
equal deleted inserted replaced
13:13c6d0aaafe5 14:9ee227acff29
594 case IMAGE_POINTER: 594 case IMAGE_POINTER:
595 if (STRINGP (IMAGE_INSTANCE_PIXMAP_FILENAME (ii))) 595 if (STRINGP (IMAGE_INSTANCE_PIXMAP_FILENAME (ii)))
596 { 596 {
597 char *s; 597 char *s;
598 Lisp_Object filename = IMAGE_INSTANCE_PIXMAP_FILENAME (ii); 598 Lisp_Object filename = IMAGE_INSTANCE_PIXMAP_FILENAME (ii);
599 s = strrchr ((char *) string_data (XSTRING (filename)), '/'); 599 s = strrchr ((char *) XSTRING_DATA (filename), '/');
600 if (s) 600 if (s)
601 print_internal (build_string (s + 1), printcharfun, 1); 601 print_internal (build_string (s + 1), printcharfun, 1);
602 else 602 else
603 print_internal (filename, printcharfun, 1); 603 print_internal (filename, printcharfun, 1);
604 } 604 }
2428 unsigned char charsets[NUM_LEADING_BYTES]; 2428 unsigned char charsets[NUM_LEADING_BYTES];
2429 struct face_cachel frame_cachel; 2429 struct face_cachel frame_cachel;
2430 struct face_cachel *cachel; 2430 struct face_cachel *cachel;
2431 2431
2432 find_charsets_in_bufbyte_string (charsets, 2432 find_charsets_in_bufbyte_string (charsets,
2433 string_data (XSTRING (string)), 2433 XSTRING_DATA (string),
2434 string_length (XSTRING (string))); 2434 XSTRING_LENGTH (string));
2435 2435
2436 if (!NILP (frame_face)) 2436 if (!NILP (frame_face))
2437 { 2437 {
2438 reset_face_cachel (&frame_cachel); 2438 reset_face_cachel (&frame_cachel);
2439 update_face_cachel_data (&frame_cachel, frame, frame_face); 2439 update_face_cachel_data (&frame_cachel, frame, frame_face);