changeset 5638:4050bbef9bf6

Automated merge with ssh://bitbucket.org/xemacs/xemacs
author Aidan Kehoe <kehoea@parhasard.net>
date Fri, 06 Jan 2012 16:35:07 +0000
parents 07256dcc0c8b (diff) a366601407c2 (current diff)
children 1d1f385c9149
files
diffstat 2 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Jan 02 16:52:59 2012 +0000
+++ b/src/ChangeLog	Fri Jan 06 16:35:07 2012 +0000
@@ -1,3 +1,8 @@
+2012-01-03  Didier Verna  <didier@xemacs.org>
+
+	* faces.c (complex_vars_of_faces): Add missing foreback specifier
+	values to the GUI Element face.
+
 2012-01-01  Aidan Kehoe  <kehoea@parhasard.net>
 
 	Add #'test-completion, API from GNU.
--- a/src/faces.c	Mon Jan 02 16:52:59 2012 +0000
+++ b/src/faces.c	Fri Jan 06 16:35:07 2012 +0000
@@ -2563,20 +2563,25 @@
        #%!@#ed up before the styles are set, which override the
        fallbacks. */
     fg_fb = Facons (list1 (Qgtk), build_ascstring ("black"), fg_fb);
+    fb_fb = Facons (list1 (Qgtk), build_ascstring ("Gray70"), fb_fb);
     bg_fb = Facons (list1 (Qgtk), build_ascstring ("Gray80"), bg_fb);
 #endif
 #ifdef HAVE_X_WINDOWS
     fg_fb = Facons (list1 (Qx), build_ascstring ("black"), fg_fb);
+    fb_fb = Facons (list1 (Qx), build_ascstring ("Gray70"), fb_fb);
     bg_fb = Facons (list1 (Qx), build_ascstring ("Gray80"), bg_fb);
 #endif
 #ifdef HAVE_TTY
     fg_fb = Facons (list1 (Qtty), Fvector (0, 0), fg_fb);
+    fb_fb = Facons (list1 (Qtty), Fvector (0, 0), fb_fb);
     bg_fb = Facons (list1 (Qtty), Fvector (0, 0), bg_fb);
 #endif
 #ifdef HAVE_MS_WINDOWS
     fg_fb = Facons (list1 (Qmsprinter), build_ascstring ("black"), fg_fb);
+    fb_fb = Facons (list1 (Qmsprinter), build_ascstring ("Gray90"), fb_fb);
     bg_fb = Facons (list1 (Qmsprinter), build_ascstring ("white"), bg_fb);
     fg_fb = Facons (list1 (Qmswindows), build_ascstring ("black"), fg_fb);
+    fb_fb = Facons (list1 (Qmswindows), build_ascstring ("Gray65"), fb_fb);
     bg_fb = Facons (list1 (Qmswindows), build_ascstring ("Gray75"), bg_fb);
 #endif
     set_specifier_fallback (Fget (Vgui_element_face, Qforeground, Qnil),