Index: source/blender/src/drawtext.c
===================================================================
--- source/blender/src/drawtext.c	(revision 11622)
+++ source/blender/src/drawtext.c	(working copy)
@@ -76,6 +76,7 @@
 #include "BIF_space.h"
 #include "BIF_mywindow.h"
 #include "BIF_resources.h"
+#include "BIF_language.h"
 
 #include "BSE_filesel.h"
 
@@ -121,7 +122,7 @@
 }
 
 static int spacetext_get_fontwidth(SpaceText *st) {
-	return BMF_GetCharacterWidth(spacetext_get_font(st), ' ');
+	return BIF_GetStringWidth(spacetext_get_font(st), " ", 0);
 }
 
 static char *temp_char_buf= NULL;
@@ -580,12 +581,14 @@
 						break;
 				}
 				glRasterPos2i(x, y);
-				BMF_DrawString(spacetext_get_font(st), out);
-				x = x+BMF_GetStringWidth(spacetext_get_font(st), out);
+				BIF_RasterPos(x, y);
+				BIF_DrawString(spacetext_get_font(st), out, 0);
+				x = x+BIF_GetStringWidth(spacetext_get_font(st), out, 0);
 			}
 		} else {
 			glRasterPos2i(x, y);
-			BMF_DrawString(spacetext_get_font(st), in);
+			BIF_RasterPos(x, y);
+			BIF_DrawString(spacetext_get_font(st), in, 0);
 		}
 	} else {
 		while (w-- && *acc++ < maxwidth) {
@@ -985,11 +988,13 @@
 			if(((float)(i + linecount + 1)/10000.0) < 1.0) {
 				sprintf(linenr, "%4d", i + linecount + 1);
 				glRasterPos2i(TXT_OFFSET - 7, curarea->winy-st->lheight*(i+1));
+				BIF_RasterPos(TXT_OFFSET - 7, curarea->winy-st->lheight*(i+1));
 			} else {
 				sprintf(linenr, "%5d", i + linecount + 1);
 				glRasterPos2i(TXT_OFFSET - 11, curarea->winy-st->lheight*(i+1));
+				BIF_RasterPos(TXT_OFFSET - 11, curarea->winy-st->lheight*(i+1));
 			}
-			BMF_DrawString(spacetext_get_font(st), linenr);
+			BIF_DrawString(spacetext_get_font(st), linenr, 0);
 			text_draw(st, tmp->line, st->left, 0, 1, TXT_OFFSET + TEXTXLOC, curarea->winy-st->lheight*(i+1), tmp->format);
 		} else
 			text_draw(st, tmp->line, st->left, 0, 1, TXT_OFFSET, curarea->winy-st->lheight*(i+1), tmp->format);