Index: HistoryItem.java
===================================================================
RCS file: /home/eclipse/org.eclipse.compare/compare/org/eclipse/compare/HistoryItem.java,v
retrieving revision 1.11
diff -u -r1.11 HistoryItem.java
--- HistoryItem.java	16 Feb 2004 15:14:04 -0000	1.11
+++ HistoryItem.java	2 Jun 2004 22:33:53 -0000
@@ -84,7 +84,10 @@
 	 * @see org.eclipse.compare.IEncodedStreamContentAccessor#getCharset()
 	 */
 	public String getCharset() throws CoreException {
-		return fFileState.getCharset();
+	    String charset= fFileState.getCharset();
+	    if (charset == null && fBase instanceof IEncodedStreamContentAccessor)
+	        charset= ((IEncodedStreamContentAccessor)fBase).getCharset();
+		return charset;
 	}
 }