XEmacs 21.4.17 "Jumbo Shrimp".

[chise/xemacs-chise.git.1] / src / objects.c

diff --git a/src/objects.c b/src/objects.c
index baccaad..c57270f 100644 (file)
--- a/src/objects.c
+++ b/src/objects.c
@@ -137,8 +137,8 @@ Optional argument DEVICE specifies the device this object applies to
 and defaults to the selected device.
 
 An error is signaled if the color is unknown or cannot be allocated;
-however, if optional argument NO-ERROR is non-nil, nil is simply
-returned in this case. (And if NO-ERROR is other than t, a warning may
+however, if optional argument NOERROR is non-nil, nil is simply
+returned in this case. (And if NOERROR is other than t, a warning may
 be issued.)
 
 The returned object is a normal, first-class lisp object.  The way you
@@ -147,7 +147,7 @@ you drop all pointers to it and allow it to be garbage collected.  When
 these objects are GCed, the underlying window-system data (e.g. X object)
 is deallocated as well.
 */
-       (name, device, no_error))
+       (name, device, noerror))
 {
   Lisp_Color_Instance *c;
   Lisp_Object val;
@@ -163,7 +163,7 @@ is deallocated as well.
 
   retval = MAYBE_INT_DEVMETH (XDEVICE (device), initialize_color_instance,
                              (c, name, device,
-                              decode_error_behavior_flag (no_error)));
+                              decode_error_behavior_flag (noerror)));
   if (!retval)
     return Qnil;
 
@@ -315,12 +315,12 @@ The returned object is a normal, first-class lisp object.  The way you
 you drop all pointers to it and allow it to be garbage collected.  When
 these objects are GCed, the underlying X data is deallocated as well.
 */
-       (name, device, no_error))
+       (name, device, noerror))
 {
   Lisp_Font_Instance *f;
   Lisp_Object val;
   int retval = 0;
-  Error_behavior errb = decode_error_behavior_flag (no_error);
+  Error_behavior errb = decode_error_behavior_flag (noerror);
 
   if (ERRB_EQ (errb, ERROR_ME))
     CHECK_STRING (name);
@@ -563,7 +563,7 @@ color_instantiate (Lisp_Object specifier, Lisp_Object matchspec,
                   XVECTOR_DATA (instantiator)[1], domain, ERROR_ME, 0, depth));
 
        default:
-         abort ();
+         ABORT ();
        }
     }
   else if (NILP (instantiator))
@@ -575,7 +575,7 @@ color_instantiate (Lisp_Object specifier, Lisp_Object matchspec,
                             device);
     }
   else
-    abort ();  /* The spec validation routines are screwed up. */
+    ABORT ();  /* The spec validation routines are screwed up. */
 
   return Qunbound;
 }
@@ -616,7 +616,11 @@ color_after_change (Lisp_Object specifier, Lisp_Object locale)
   Lisp_Object property =
     COLOR_SPECIFIER_FACE_PROPERTY (XCOLOR_SPECIFIER (specifier));
   if (!NILP (face))
-    face_property_was_changed (face, property, locale);
+    {
+      face_property_was_changed (face, property, locale);
+      if (BUFFERP (locale))
+       XBUFFER (locale)->buffer_local_face_property = 1;
+    }
 }
 
 void
@@ -783,7 +787,7 @@ font_instantiate (Lisp_Object specifier, Lisp_Object matchspec,
   else if (NILP (instantiator))
     return Qunbound;
   else
-    abort ();  /* Eh? */
+    ABORT ();  /* Eh? */
 
   return Qunbound;
 }
@@ -814,7 +818,11 @@ font_after_change (Lisp_Object specifier, Lisp_Object locale)
   Lisp_Object property =
     FONT_SPECIFIER_FACE_PROPERTY (XFONT_SPECIFIER (specifier));
   if (!NILP (face))
-    face_property_was_changed (face, property, locale);
+    {
+      face_property_was_changed (face, property, locale);
+      if (BUFFERP (locale))
+       XBUFFER (locale)->buffer_local_face_property = 1;
+    }
 }
 
 void
@@ -902,7 +910,7 @@ face_boolean_instantiate (Lisp_Object specifier, Lisp_Object matchspec,
       return retval;
     }
   else
-    abort ();  /* Eh? */
+    ABORT ();  /* Eh? */
 
   return Qunbound;
 }
@@ -949,7 +957,11 @@ face_boolean_after_change (Lisp_Object specifier, Lisp_Object locale)
   Lisp_Object property =
     FACE_BOOLEAN_SPECIFIER_FACE_PROPERTY (XFACE_BOOLEAN_SPECIFIER (specifier));
   if (!NILP (face))
-    face_property_was_changed (face, property, locale);
+    {
+      face_property_was_changed (face, property, locale);
+      if (BUFFERP (locale))
+       XBUFFER (locale)->buffer_local_face_property = 1;
+    }
 }
 
 void