[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xfaces.c
From: |
Kim F. Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/xfaces.c |
Date: |
Sat, 24 May 2003 18:09:13 -0400 |
Index: emacs/src/xfaces.c
diff -c emacs/src/xfaces.c:1.275 emacs/src/xfaces.c:1.276
*** emacs/src/xfaces.c:1.275 Mon May 19 10:41:09 2003
--- emacs/src/xfaces.c Sat May 24 18:09:13 2003
***************
*** 228,237 ****
#define check_x check_w32
#define x_list_fonts w32_list_fonts
#define GCGraphicsExposures 0
- /* 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 /* WINDOWSNT */
#ifdef MAC_OS
--- 228,233 ----
***************
*** 1215,1244 ****
/***********************************************************************
- Minimum font bounds
- ***********************************************************************/
-
- #ifdef HAVE_WINDOW_SYSTEM
-
- /* Update the line_height of frame F. Return non-zero if line height
- changes. */
-
- int
- frame_update_line_height (f)
- struct frame *f;
- {
- int line_height, changed_p;
-
- line_height = FONT_HEIGHT (FRAME_FONT (f));
- changed_p = line_height != FRAME_LINE_HEIGHT (f);
- FRAME_LINE_HEIGHT (f) = line_height;
- return changed_p;
- }
-
- #endif /* HAVE_WINDOW_SYSTEM */
-
-
- /***********************************************************************
Fonts
***********************************************************************/
--- 1211,1216 ----
***************
*** 2963,2972 ****
? NULL
: FACE_FROM_ID (f, face_id));
if (face && face->font)
size = FONT_WIDTH (face->font);
else
! size = FONT_WIDTH (FRAME_FONT (f));
if (!NILP (width))
size *= XINT (width);
--- 2935,2951 ----
? 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
! size = FONT_WIDTH (FRAME_FONT (f)); /* FRAME_COLUMN_WIDTH (f) */
if (!NILP (width))
size *= XINT (width);