From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 7 Aug 1994 04:51:57 +0000 (+0000)
Subject: (compute_glyph_face_1): New function.
X-Git-Tag: emacs-19.34~7381
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2e16580f125edd2e7f63c8fc2a2489245eaf8c1c;p=emacs.git

(compute_glyph_face_1): New function.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index e147fb0c05b..4869076e07d 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -743,6 +743,31 @@ compute_glyph_face (f, face_code, current_face)
 
   return intern_computed_face (f, &face);
 }
+
+/* Return the face ID to use to display a special glyph which selects
+   FACE_CODE as the face ID, assuming that ordinarily the face would
+   be CURRENT_FACE.  F is the frame.  */
+
+int
+compute_glyph_face_1 (f, face_name, current_face)
+     struct frame *f;
+     Lisp_Object face_name;
+     int current_face;
+{
+  struct face face;
+
+  face = *FRAME_COMPUTED_FACES (f)[current_face];
+
+  if (!NILP (face_name))
+    {
+      int facecode = face_name_id_number (f, face_name);
+      if (facecode >= 0 && facecode < FRAME_N_PARAM_FACES (f)
+	  && FRAME_PARAM_FACES (f) [facecode] != 0)
+	merge_faces (FRAME_PARAM_FACES (f) [facecode], &face);
+    }
+
+  return intern_computed_face (f, &face);
+}
 
 /* Return the face ID associated with a buffer position POS.
    Store into *ENDPTR the position at which a different face is needed.