diff --git a/edit/edit.h b/edit/edit.h
index 4381e2496..cfefe23ca 100644
--- a/edit/edit.h
+++ b/edit/edit.h
@@ -66,8 +66,6 @@
 
 #define EDIT_TEXT_HORIZONTAL_OFFSET 0
 #define EDIT_TEXT_VERTICAL_OFFSET 1
-#define FONT_OFFSET_X 0
-#define FONT_OFFSET_Y 0
 
 #define EDIT_RIGHT_EXTREME option_edit_right_extreme
 #define EDIT_LEFT_EXTREME option_edit_left_extreme
@@ -264,12 +262,6 @@ void format_paragraph (WEdit *edit, int force);
 /* either command or char_for_insertion must be passed as -1 */
 int edit_execute_cmd (WEdit * edit, int command, int char_for_insertion);
 
-#define CPushFont(x,y)
-#define CPopFont()
-#define FIXED_FONT 1
-#define FONT_PIX_PER_LINE 1
-#define FONT_MEAN_WIDTH 1
-     
 #define get_sys_error(s) (s)
 
 #define edit_error_dialog(h,s) query_dialog (h, s, 0, 1, _("&Dismiss"))
diff --git a/edit/editdraw.c b/edit/editdraw.c
index 996f5cc7d..f70915241 100644
--- a/edit/editdraw.c
+++ b/edit/editdraw.c
@@ -39,6 +39,12 @@
 #define MOD_MARKED		(1 << 10)
 #define MOD_CURSOR		(1 << 11)
 
+#define FONT_OFFSET_X 0
+#define FONT_OFFSET_Y 0
+#define FIXED_FONT 1
+#define FONT_PIX_PER_LINE 1
+#define FONT_MEAN_WIDTH 1
+
 
 static void status_string (WEdit * edit, char *s, int w, int fill)
 {
@@ -335,8 +341,6 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
     int force = edit->force;
     long b;
 
-    CPushFont ("editor", 0);
-
 /*
  * If the position of the page has not moved then we can draw the cursor
  * character only.  This will prevent line flicker when using arrow keys.
@@ -432,7 +436,6 @@ render_edit_text (WEdit * edit, long start_row, long start_column, long end_row,
   exit_render:
     edit->screen_modified = 0;
     prev_start = edit->start_line;
-    CPopFont ();
     return;
 }
 
diff --git a/edit/wordproc.c b/edit/wordproc.c
index 3770b4d03..1ea646aef 100644
--- a/edit/wordproc.c
+++ b/edit/wordproc.c
@@ -25,6 +25,7 @@
 #define tab_width option_tab_spacing
 
 #define NO_FORMAT_CHARS_START "-+*\\,.;:&>"
+#define FONT_MEAN_WIDTH 1
 
 static long
 line_start (WEdit *edit, long line)