From: Stefan Monnier Date: Wed, 29 Aug 2007 21:46:05 +0000 (+0000) Subject: (internal_resolve_face_name): Return a value. X-Git-Tag: emacs-pretest-23.0.90~11210 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2ed82a63ab09a89f1ad95320d192c46f85d96335;p=emacs.git (internal_resolve_face_name): Return a value. (internal_resolve_face_name, resolve_face_name_error): Comment out. --- 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, +#if 0 /* Seems to be unused. */ static Lisp_Object internal_resolve_face_name (nargs, args) int nargs; Lisp_Object *args; { - Fget (args[0], args[1]); + return Fget (args[0], args[1]); } static Lisp_Object @@ -3238,6 +3239,7 @@ resolve_face_name_error (ignore) { return Qnil; } +#endif /* Resolve face name FACE_NAME. If FACE_NAME is a string, intern it to make it a symbol. If FACE_NAME is an alias for another face,