aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiles Bader2003-04-03 01:40:58 +0000
committerMiles Bader2003-04-03 01:40:58 +0000
commit774666fb43580d6dcca8616cea49d1abb6489c9b (patch)
tree6f20c68c13d5fab801879ff3de21ddec7302d92d /src
parent29c1653c7a3764a712b568af8e5a845fc057466d (diff)
downloademacs-774666fb43580d6dcca8616cea49d1abb6489c9b.tar.gz
emacs-774666fb43580d6dcca8616cea49d1abb6489c9b.zip
(choose_face_font): Make sure *NEEDS_OVERSTRIKE is always set.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xfaces.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 1e9d6c12ee6..ed6eb184e8c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12003-04-03 Miles Bader <miles@gnu.org>
2
3 * xfaces.c (choose_face_font): Make sure *NEEDS_OVERSTRIKE is
4 always set.
5
12003-04-01 Dave Love <fx@gnu.org> 62003-04-01 Dave Love <fx@gnu.org>
2 7
3 * xfns.c (xpm_lookup_color): Grok "opaque". 8 * xfns.c (xpm_lookup_color): Grok "opaque".
diff --git a/src/xfaces.c b/src/xfaces.c
index 71c2915e806..ab91fc24de9 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1,5 +1,5 @@
1/* xfaces.c -- "Face" primitives. 1/* xfaces.c -- "Face" primitives.
2 Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002 2 Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003
3 Free Software Foundation. 3 Free Software Foundation.
4 4
5This file is part of GNU Emacs. 5This file is part of GNU Emacs.
@@ -6439,6 +6439,9 @@ choose_face_font (f, attrs, fontset, c, needs_overstrike)
6439 struct font_name *fonts; 6439 struct font_name *fonts;
6440 int nfonts, width_ratio; 6440 int nfonts, width_ratio;
6441 6441
6442 if (needs_overstrike)
6443 *needs_overstrike = 0;
6444
6442 /* Get (foundry and) family name and registry (and encoding) name of 6445 /* Get (foundry and) family name and registry (and encoding) name of
6443 a font for C. */ 6446 a font for C. */
6444 pattern = fontset_font_pattern (f, fontset, c); 6447 pattern = fontset_font_pattern (f, fontset, c);