comparison src/objects.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 fdefd0186b75
comparison
equal deleted inserted replaced
577:910449c92002 578:190b164ddcac
232 ***************************************************************************/ 232 ***************************************************************************/
233 233
234 Lisp_Object Qfont_instancep; 234 Lisp_Object Qfont_instancep;
235 235
236 static Lisp_Object font_instance_truename_internal (Lisp_Object xfont, 236 static Lisp_Object font_instance_truename_internal (Lisp_Object xfont,
237 Error_behavior errb); 237 Error_Behavior errb);
238 238
239 static Lisp_Object 239 static Lisp_Object
240 mark_font_instance (Lisp_Object obj) 240 mark_font_instance (Lisp_Object obj)
241 { 241 {
242 Lisp_Font_Instance *f = XFONT_INSTANCE (obj); 242 Lisp_Font_Instance *f = XFONT_INSTANCE (obj);
318 (name, device, noerror)) 318 (name, device, noerror))
319 { 319 {
320 Lisp_Font_Instance *f; 320 Lisp_Font_Instance *f;
321 Lisp_Object val; 321 Lisp_Object val;
322 int retval = 0; 322 int retval = 0;
323 Error_behavior errb = decode_error_behavior_flag (noerror); 323 Error_Behavior errb = decode_error_behavior_flag (noerror);
324 324
325 if (ERRB_EQ (errb, ERROR_ME)) 325 if (ERRB_EQ (errb, ERROR_ME))
326 CHECK_STRING (name); 326 CHECK_STRING (name);
327 else if (!STRINGP (name)) 327 else if (!STRINGP (name))
328 return Qnil; 328 return Qnil;
413 return XFONT_INSTANCE (font_instance)->proportional_p ? Qt : Qnil; 413 return XFONT_INSTANCE (font_instance)->proportional_p ? Qt : Qnil;
414 } 414 }
415 415
416 static Lisp_Object 416 static Lisp_Object
417 font_instance_truename_internal (Lisp_Object font_instance, 417 font_instance_truename_internal (Lisp_Object font_instance,
418 Error_behavior errb) 418 Error_Behavior errb)
419 { 419 {
420 Lisp_Font_Instance *f = XFONT_INSTANCE (font_instance); 420 Lisp_Font_Instance *f = XFONT_INSTANCE (font_instance);
421 421
422 if (NILP (f->device)) 422 if (NILP (f->device))
423 { 423 {