From 8d68cdab819a4598997fcc6079fbe1f273acff3f Mon Sep 17 00:00:00 2001
From: Michael Jennings <mej@kainx.org>
Date: Sat, 28 Aug 1999 02:40:00 +0000
Subject: [PATCH] Fri Aug 27 19:39:26 PDT 1999	Michael Jennings
 <mej@eterm.org>

	Fix fix fix.


SVN revision: 107
---
 ChangeLog       |  5 +++++
 src/Makefile.am |  6 +++---
 src/screen.c    | 14 ++++----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 813fdbe..444301b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2351,3 +2351,8 @@ Wed Aug 25 12:28:50 PDT 1999	Michael Jennings <mej@eterm.org>
 	Applied XIM fix from Sung-Hyun Nam <namsh@lgic.co.kr>.
 	
 -------------------------------------------------------------------------------
+Fri Aug 27 19:39:26 PDT 1999	Michael Jennings <mej@eterm.org>
+
+	Fix fix fix.
+	
+-------------------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 61a952b..5a6aafd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,16 +4,16 @@ lib_LTLIBRARIES = libEterm.la
 
 libEterm_la_SOURCES = actions.c command.c e.c events.c graphics.c grkelot.c menus.c misc.c netdisp.c \
                       options.c pixmap.c screen.c scrollbar.c system.c term.c threads.c timer.c utmp.c windows.c
-libEterm_la_DEPENDENCIES = $(DIST_ROOT)/libmej/libmej.la feature.h
+libEterm_la_DEPENDENCIES = $(top_srcdir)/libmej/libmej.la feature.h
 libEterm_la_LDFLAGS = -version-info 9:0:9
 
 bin_PROGRAMS = Eterm
 Eterm_SOURCES = main.c
 Eterm_DEPENDENCIES = libEterm.la
-Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir) libEterm.la
+Eterm_LDFLAGS = -rpath $(libdir):$(pkglibdir)
 
 INCLUDES = -I. -I$(top_srcdir)/libmej -I.. -I$(includedir) -I$(prefix)/include $(X_CFLAGS)
-LDADD = $(DIST_ROOT)/libmej/libmej.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS)
+LDADD = libEterm.la $(top_srcdir)/libmej/libmej.la -L$(libdir) -L$(prefix)/lib $(LIBS) $(GRLIBS) $(X_LIBS)
 
 EXTRA_DIST = actions.h command.h debug.h e.h eterm_utmp.h events.h feature.h graphics.h grkelot.h grx.h main.h menus.h misc.h \
              options.h pixmap.h profile.h screen.h scrollbar.h system.h term.h threads.h timer.h windows.h graphics/Makefile.am \
diff --git a/src/screen.c b/src/screen.c
index 156a36a..412c3d9 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1632,6 +1632,10 @@ scr_expose(int x, int y, int width, int height)
   if (part_end.col != full_end.col)
     for (i = full_beg.row; i <= full_end.row; i++)
       drawn_rend[i][part_end.col] = RS_Dirty;
+
+#ifdef USE_XIM
+  scr_refresh(SLOW_REFRESH);
+#endif
 }
 
 /* ------------------------------------------------------------------------- */
@@ -1800,7 +1804,6 @@ scr_refresh(int type)
 #ifdef OPTIMIZE_HACKS
   register int nrows = TermWin.nrow;
   register int ncols = TermWin.ncol;
-
 #endif
 
 #ifdef PROFILE_SCREEN
@@ -2051,18 +2054,12 @@ scr_refresh(int type)
 	    && PixColors[back] != PixColors[colorBD]) {
 	  gcvalue.foreground = PixColors[colorBD];
 	  gcmask |= GCForeground;
-#if 0
-	  rend &= ~RS_Bold;	/* we've taken care of it */
-#endif
 	}
       } else if (rend & RS_Uline) {
 	if (PixColors[fore] != PixColors[colorUL]
 	    && PixColors[back] != PixColors[colorUL]) {
 	  gcvalue.foreground = PixColors[colorUL];
 	  gcmask |= GCForeground;
-#if 0
-	  rend &= ~RS_Uline;	/* we've taken care of it */
-#endif
 	}
       }
 #endif
@@ -2085,9 +2082,6 @@ scr_refresh(int type)
 #ifndef NO_BOLDFONT
       if (!wbyte && MONO_BOLD(rend) && TermWin.boldFont != NULL) {
 	XSetFont(Xdisplay, TermWin.gc, TermWin.boldFont->fid);
-#if 0
-	rend &= ~RS_Bold;	/* we've taken care of it */
-#endif
 	bfont = 1;
       } else if (bfont) {
 	bfont = 0;