projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
2597b61
..
c57270f
100644
(file)
--- a/
src/objects.c
+++ b/
src/objects.c
@@
-563,7
+563,7
@@
color_instantiate (Lisp_Object specifier, Lisp_Object matchspec,
XVECTOR_DATA (instantiator)[1], domain, ERROR_ME, 0, depth));
default:
XVECTOR_DATA (instantiator)[1], domain, ERROR_ME, 0, depth));
default:
- abort ();
+ ABORT ();
}
}
else if (NILP (instantiator))
}
}
else if (NILP (instantiator))
@@
-575,7
+575,7
@@
color_instantiate (Lisp_Object specifier, Lisp_Object matchspec,
device);
}
else
device);
}
else
- abort (); /* The spec validation routines are screwed up. */
+ ABORT (); /* The spec validation routines are screwed up. */
return Qunbound;
}
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))
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
}
void
@@
-783,7
+787,7
@@
font_instantiate (Lisp_Object specifier, Lisp_Object matchspec,
else if (NILP (instantiator))
return Qunbound;
else
else if (NILP (instantiator))
return Qunbound;
else
- abort (); /* Eh? */
+ ABORT (); /* Eh? */
return Qunbound;
}
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))
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
}
void
@@
-902,7
+910,7
@@
face_boolean_instantiate (Lisp_Object specifier, Lisp_Object matchspec,
return retval;
}
else
return retval;
}
else
- abort (); /* Eh? */
+ ABORT (); /* Eh? */
return Qunbound;
}
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))
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
}
void