From: Gerd Moellmann <gerd@gnu.org>
Date: Tue, 7 Dec 1999 20:06:40 +0000 (+0000)
Subject: (x_set_menu_resources_from_menu_face): Make sure
X-Git-Tag: emacs-pretest-21.0.90~5837
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=15daa94436ab4a4aa15b0f867d729d820486ed76;p=emacs.git

(x_set_menu_resources_from_menu_face): Make sure
basic faces are realized before trying to use face `menu'.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 5fb16e5509d..4e8e2514c1d 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3988,6 +3988,12 @@ x_set_menu_resources_from_menu_face (f, widget)
      struct frame *f;
      Widget widget;
 {
+  /* Realized faces may have been removed on frame F, e.g. because of
+     face attribute changes.  Recompute them, if necessary, since we
+     will need the `menu' face.  */
+  if (f->face_cache->used == 0)
+    recompute_basic_faces (f);
+  
 #ifdef USE_LUCID
   xl_set_menu_resources_from_menu_face (f, widget);
 #endif