Mercurial > hg > xemacs-beta
diff src/faces.c @ 2867:abbd4c295aa2
[xemacs-hg @ 2005-07-20 07:36:33 by didierv]
Face aliases II (suggestions from sjt)
| author | didierv |
|---|---|
| date | Wed, 20 Jul 2005 07:36:44 +0000 |
| parents | 8baa2f03d853 |
| children | 1e7cc382eb16 |
line wrap: on
line diff
--- a/src/faces.c Tue Jul 19 21:51:19 2005 +0000 +++ b/src/faces.c Wed Jul 20 07:36:44 2005 +0000 @@ -60,7 +60,7 @@ /* Qdefault, Qhighlight, Qleft_margin, Qright_margin defined in general.c */ Lisp_Object Qmodeline, Qgui_element, Qtext_cursor, Qvertical_divider; -Lisp_Object Qface_alias, Qcyclic_face_aliasing; +Lisp_Object Qface_alias, Qcyclic_face_alias; /* In the old implementation Vface_list was a list of the face names, not the faces themselves. We now distinguish between permanent and @@ -641,11 +641,11 @@ face_name = face_or_name; CHECK_SYMBOL (face_name); -# define FACE_ALIASING_MAX_DEPTH 32 +# define FACE_ALIAS_MAX_DEPTH 32 i = 0; while (! NILP ((face_alias = Fget (face_name, Qface_alias, Qnil))) - && i < FACE_ALIASING_MAX_DEPTH) + && i < FACE_ALIAS_MAX_DEPTH) { face_name = face_alias; CHECK_SYMBOL (face_alias); @@ -654,12 +654,12 @@ /* #### This test actually makes the aliasing max depth to 30, which is more #### than enough IMO. -- dvl */ - if (i == FACE_ALIASING_MAX_DEPTH) - signal_error (Qcyclic_face_aliasing, + if (i == FACE_ALIAS_MAX_DEPTH) + signal_error (Qcyclic_face_alias, "Max face aliasing depth reached", face_name); -# undef FACE_ALIASING_MAX_DEPTH +# undef FACE_ALIAS_MAX_DEPTH /* Check if the name represents a permanent face. */ retval = Fgethash (face_name, Vpermanent_faces_cache, Qnil); @@ -1892,7 +1892,7 @@ DEFSYMBOL (Qblinking); DEFSYMBOL (Qface_alias); - DEFERROR_STANDARD (Qcyclic_face_aliasing, Qinvalid_state); + DEFERROR_STANDARD (Qcyclic_face_alias, Qinvalid_state); DEFSYMBOL (Qinit_face_from_resources); DEFSYMBOL (Qinit_global_faces);