comparison src/faces.c @ 578:190b164ddcac

[xemacs-hg @ 2001-05-25 11:26:50 by ben] device-msw.c, eldap.c, emodules.c, hpplay.c, process-unix.c, sound.h, tooltalk.c, win32.c: Revert Martin's attempted compile-warnings fix. It does fix the warnings, but not the right way. We are trying to eliminate the raw use of `char' and `unsigned char' absolutely everywhere. There is never an occasion to reintroduce these. buffer.h: Instead, we fix these macros so they don't care about the type of their lvalues. We already do this for the non-C-string equivalents of these, and it's correct because it should be OK to pass in an SBufbyte *, for example. In any case, we do not need any type-correctness checking here -- errors will be caught for sure as soon as we remove the -Wno-sign-compare switch. mule-charset.c: Use invalid_argument, not generic signal_error (Qerror, ). alloc.c, chartab.c, console-gtk.c, console-msw.c, console-stream.c, console-stream.h, console-tty.c, console-tty.h, console-x.c, console.c, console.h, device-x.c, device.c, elhash.c, eval.c, faces.c, faces.h, fns.c, glyphs.c, glyphs.h, gui.c, gui.h, lisp.h, lread.c, nt.c, objects-gtk.c, objects-gtk.h, objects-msw.c, objects-tty.c, objects-x.c, objects.c, process-unix.c, rangetab.c, search.c, specifier.c, toolbar.c, window.c, window.h: Rename Error_behavior to Error_Behavior, to be consistent with general naming practices (Lisp_Object, Char_Binary, etc.).
author ben
date Fri, 25 May 2001 11:27:01 +0000
parents 183866b06e0b
children b39c14581166
comparison
equal deleted inserted replaced
577:910449c92002 578:190b164ddcac
292 /* face read syntax */ 292 /* face read syntax */
293 /************************************************************************/ 293 /************************************************************************/
294 294
295 static int 295 static int
296 face_name_validate (Lisp_Object keyword, Lisp_Object value, 296 face_name_validate (Lisp_Object keyword, Lisp_Object value,
297 Error_behavior errb) 297 Error_Behavior errb)
298 { 298 {
299 if (ERRB_EQ (errb, ERROR_ME)) 299 if (ERRB_EQ (errb, ERROR_ME))
300 { 300 {
301 CHECK_SYMBOL (value); 301 CHECK_SYMBOL (value);
302 return 1; 302 return 1;
304 304
305 return SYMBOLP (value); 305 return SYMBOLP (value);
306 } 306 }
307 307
308 static int 308 static int
309 face_validate (Lisp_Object data, Error_behavior errb) 309 face_validate (Lisp_Object data, Error_Behavior errb)
310 { 310 {
311 int name_seen = 0; 311 int name_seen = 0;
312 Lisp_Object valw = Qnil; 312 Lisp_Object valw = Qnil;
313 313
314 data = Fcdr (data); /* skip over Qface */ 314 data = Fcdr (data); /* skip over Qface */
553 #endif /* 0 */ 553 #endif /* 0 */
554 554
555 Lisp_Object 555 Lisp_Object
556 face_property_matching_instance (Lisp_Object face, Lisp_Object property, 556 face_property_matching_instance (Lisp_Object face, Lisp_Object property,
557 Lisp_Object charset, Lisp_Object domain, 557 Lisp_Object charset, Lisp_Object domain,
558 Error_behavior errb, int no_fallback, 558 Error_Behavior errb, int no_fallback,
559 Lisp_Object depth) 559 Lisp_Object depth)
560 { 560 {
561 Lisp_Object retval = 561 Lisp_Object retval =
562 specifier_instance_no_quit (Fget (face, property, Qnil), charset, 562 specifier_instance_no_quit (Fget (face, property, Qnil), charset,
563 domain, errb, no_fallback, depth); 563 domain, errb, no_fallback, depth);