diff src/glyphs.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 4b7d425dd3c2
line wrap: on
line diff
--- a/src/glyphs.c	Fri May 25 10:04:29 2001 +0000
+++ b/src/glyphs.c	Fri May 25 11:27:01 2001 +0000
@@ -154,7 +154,7 @@
 
 struct image_instantiator_methods *
 decode_device_ii_format (Lisp_Object device, Lisp_Object format,
-			 Error_behavior errb)
+			 Error_Behavior errb)
 {
   int i;
 
@@ -190,7 +190,7 @@
 }
 
 struct image_instantiator_methods *
-decode_image_instantiator_format (Lisp_Object format, Error_behavior errb)
+decode_image_instantiator_format (Lisp_Object format, Error_Behavior errb)
 {
   return decode_device_ii_format (Qnil, format, errb);
 }
@@ -1291,7 +1291,7 @@
 }
 
 static enum image_instance_type
-decode_image_instance_type (Lisp_Object type, Error_behavior errb)
+decode_image_instance_type (Lisp_Object type, Error_Behavior errb)
 {
   if (ERRB_EQ (errb, ERROR_ME))
     CHECK_SYMBOL (type);
@@ -1413,7 +1413,7 @@
   return Fcopy_sequence (Vimage_instance_type_list);
 }
 
-Error_behavior
+Error_Behavior
 decode_error_behavior_flag (Lisp_Object noerror)
 {
   if (NILP (noerror))        return ERROR_ME;
@@ -1422,7 +1422,7 @@
 }
 
 Lisp_Object
-encode_error_behavior_flag (Error_behavior errb)
+encode_error_behavior_flag (Error_Behavior errb)
 {
   if (ERRB_EQ (errb, ERROR_ME))
     return Qnil;
@@ -1575,7 +1575,7 @@
 */
        (data, domain, dest_types, noerror))
 {
-  Error_behavior errb = decode_error_behavior_flag (noerror);
+  Error_Behavior errb = decode_error_behavior_flag (noerror);
 
   return call_with_suspended_errors ((lisp_fn_t) make_image_instance_1,
 				     Qnil, Qimage, errb,
@@ -3762,7 +3762,7 @@
 }
 
 static enum glyph_type
-decode_glyph_type (Lisp_Object type, Error_behavior errb)
+decode_glyph_type (Lisp_Object type, Error_Behavior errb)
 {
   if (NILP (type))
     return GLYPH_BUFFER;
@@ -3863,7 +3863,7 @@
 
 Lisp_Object
 glyph_image_instance (Lisp_Object glyph, Lisp_Object domain,
-		      Error_behavior errb, int no_quit)
+		      Error_Behavior errb, int no_quit)
 {
   Lisp_Object specifier = GLYPH_IMAGE (XGLYPH (glyph));