From: Jason Rumney <jasonr@gnu.org>
Date: Sat, 2 Jun 2007 22:07:16 +0000 (+0000)
Subject: (Fx_list_fonts) [WINDOWSNT]: Remove Windows only redefinition of FONT_WIDTH.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~455
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=12f7daf1aeed6e991fab2596a8791b33f3167a46;p=emacs.git

(Fx_list_fonts) [WINDOWSNT]: Remove Windows only redefinition of FONT_WIDTH.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 1b314a6fa13..b2ec813a465 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3148,13 +3148,6 @@ the WIDTH times as wide as FACE on FRAME.  */)
 			   ? NULL
 			   : FACE_FROM_ID (f, face_id));
 
-#ifdef WINDOWSNT
-/* For historic reasons, FONT_WIDTH refers to average width on W32,
-   not maximum as on X.  Redefine here. */
-#undef FONT_WIDTH
-#define FONT_WIDTH FONT_MAX_WIDTH
-#endif
-
       if (face && face->font)
 	size = FONT_WIDTH (face->font);
       else