Merged from emacs@sv.gnu.org.

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-479
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-480
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-481
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-482
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-483
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-484
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-485
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-153
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-154
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-155
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-585

1 files changed, 2 insertions, 2 deletions

diff --git a/src/xfaces.c b/src/xfaces.c
index 6373100484a..b55118acdf0 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6705,10 +6705,10 @@ best_matching_font (f, attrs, fonts, nfonts, width_ratio, needs_overstrike)
         {
           /* We want a bold font, but didn't get one; try to use
              overstriking instead to simulate bold-face.  However,
-             don't overstrike an already-bold fontn unless the
+             don't overstrike an already-bold font unless the
              desired weight grossly exceeds the available weight.  */
           if (got_weight > XLFD_WEIGHT_MEDIUM)
-            *needs_overstrike = (got_weight - want_weight) > 2;
+            *needs_overstrike = (want_weight - got_weight) > 2;
           else
             *needs_overstrike = 1;
         }