diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp
index 7d2b401048c..0a8910b215c 100644
--- a/mozilla/layout/generic/nsTextFrame.cpp
+++ b/mozilla/layout/generic/nsTextFrame.cpp
@@ -682,8 +682,15 @@ TextFrame::PrepareUnicodeText(nsTextTransformer& aTX,
   return numSpaces;
 }
 
-
-//#define SHOW_SELECTION_CURSOR			// should be turned off when the caret code is activated
+//
+// This should be commented out, but some gfx changes on the weekend of
+// 4/20-21/1999 broke caret rendering on Unix, so in a vain effort to
+// get any cursor at all visible, I've uncommented this for Unix. :-(
+// See http://bugzilla.mozilla.org/show_bug.cgi?id=4202 for status.
+//
+#ifdef XP_UNIX
+#define SHOW_SELECTION_CURSOR			// should be turned off when the caret code is activated
+#endif
 
 #ifdef SHOW_SELECTION_CURSOR
 
diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp
index 7d2b401048c..0a8910b215c 100644
--- a/mozilla/layout/html/base/src/nsTextFrame.cpp
+++ b/mozilla/layout/html/base/src/nsTextFrame.cpp
@@ -682,8 +682,15 @@ TextFrame::PrepareUnicodeText(nsTextTransformer& aTX,
   return numSpaces;
 }
 
-
-//#define SHOW_SELECTION_CURSOR			// should be turned off when the caret code is activated
+//
+// This should be commented out, but some gfx changes on the weekend of
+// 4/20-21/1999 broke caret rendering on Unix, so in a vain effort to
+// get any cursor at all visible, I've uncommented this for Unix. :-(
+// See http://bugzilla.mozilla.org/show_bug.cgi?id=4202 for status.
+//
+#ifdef XP_UNIX
+#define SHOW_SELECTION_CURSOR			// should be turned off when the caret code is activated
+#endif
 
 #ifdef SHOW_SELECTION_CURSOR