diff options
| author | Gerd Moellmann <gerd@gnu.org> | 2001-04-05 12:13:17 +0000 |
|---|---|---|
| committer | Gerd Moellmann <gerd@gnu.org> | 2001-04-05 12:13:17 +0000 |
| commit | 441bf85699fa9dc69b29687b648aef355d95d6d5 (patch) | |
| tree | a27399a0d32ea00c6f064687fd293b139cf6a92f | |
| parent | 37a0ae84a49fcec4f13ea64187ecf3fcd4b6f95a (diff) | |
| download | emacs-441bf85699fa9dc69b29687b648aef355d95d6d5.tar.gz | |
(realizing_basic_faces_p): Renamed from
realize_default_face_p.
(realize_basic_faces): Set/clear realizing_basic_faces_p.
(realize_default_face): Don't set the flag.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/xfaces.c | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 36eac1ca486..96fbf3120d9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2001-04-05 Gerd Moellmann <gerd@gnu.org> + + * xfaces.c (realizing_basic_faces_p): Renamed from + realize_default_face_p. + (realize_basic_faces): Set/clear realizing_basic_faces_p. + (realize_default_face): Don't set the flag. + 2001-04-04 Gerd Moellmann <gerd@gnu.org> * lisp.h (echoing, echo_message_buffer, cancel_echoing): Declare. diff --git a/src/xfaces.c b/src/xfaces.c index caf69488145..ac8a771e847 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -489,7 +489,7 @@ static Lisp_Object Vparam_value_alist; /* Non-zero while realizing the default face. */ -static int realizing_default_face_p; +static int realizing_basic_faces_p; /* The total number of colors currently allocated. */ @@ -2362,7 +2362,7 @@ x_face_list_fonts (f, pattern, fonts, nfonts, try_alternatives_p) /* If someone specified a default font that's scalable, try to do the right thing. */ - if (realizing_default_face_p + if (realizing_basic_faces_p && try_alternatives_p && n == 0 && nignored > 0) @@ -5954,6 +5954,7 @@ realize_basic_faces (f) /* Block input there so that we won't be surprised by an X expose event, for instance without having the faces set up. */ BLOCK_INPUT; + realizing_basic_faces_p = 1; if (realize_default_face (f)) { @@ -5979,6 +5980,7 @@ realize_basic_faces (f) success_p = 1; } + realizing_basic_faces_p = 0; UNBLOCK_INPUT; return success_p; } @@ -6081,11 +6083,7 @@ realize_default_face (f) xassert (lface_fully_specified_p (XVECTOR (lface)->contents)); check_lface (lface); bcopy (XVECTOR (lface)->contents, attrs, sizeof attrs); - - realizing_default_face_p = 1; face = realize_face (c, attrs, 0, NULL, DEFAULT_FACE_ID); - realizing_default_face_p = 0; - return 1; } |