aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStefan Monnier2007-08-29 21:46:05 +0000
committerStefan Monnier2007-08-29 21:46:05 +0000
commit2ed82a63ab09a89f1ad95320d192c46f85d96335 (patch)
tree9e0234c3605b48230f00320744c993cb62a34eb5 /src
parentfd0f53a90906db0dec3084f3085b7edd21c6c779 (diff)
downloademacs-2ed82a63ab09a89f1ad95320d192c46f85d96335.tar.gz
emacs-2ed82a63ab09a89f1ad95320d192c46f85d96335.zip
(internal_resolve_face_name): Return a value.
(internal_resolve_face_name, resolve_face_name_error): Comment out.
Diffstat (limited to 'src')
-rw-r--r--src/xfaces.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/xfaces.c b/src/xfaces.c
index 734e2eb3827..a1573235cd0 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3224,12 +3224,13 @@ push_named_merge_point (struct named_merge_point *new_named_merge_point,
3224 3224
3225 3225
3226 3226
3227#if 0 /* Seems to be unused. */
3227static Lisp_Object 3228static Lisp_Object
3228internal_resolve_face_name (nargs, args) 3229internal_resolve_face_name (nargs, args)
3229 int nargs; 3230 int nargs;
3230 Lisp_Object *args; 3231 Lisp_Object *args;
3231{ 3232{
3232 Fget (args[0], args[1]); 3233 return Fget (args[0], args[1]);
3233} 3234}
3234 3235
3235static Lisp_Object 3236static Lisp_Object
@@ -3238,6 +3239,7 @@ resolve_face_name_error (ignore)
3238{ 3239{
3239 return Qnil; 3240 return Qnil;
3240} 3241}
3242#endif
3241 3243
3242/* Resolve face name FACE_NAME. If FACE_NAME is a string, intern it 3244/* Resolve face name FACE_NAME. If FACE_NAME is a string, intern it
3243 to make it a symbol. If FACE_NAME is an alias for another face, 3245 to make it a symbol. If FACE_NAME is an alias for another face,