diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/BufferedDocumentScanner.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/BufferedDocumentScanner.java
index 1e758bbd000..0797f0ba6fb 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/BufferedDocumentScanner.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/BufferedDocumentScanner.java
@@ -45,7 +45,7 @@ public final class BufferedDocumentScanner implements ICharacterScanner {
 	}
 	
 	/**
-	 * Fills the buffer with the contents of the document starting at the given offset.
+	 * Fills the buffer with the contens of the document starting at the given offset.
 	 *
 	 * @param offset the document offset at which the buffer starts
 	 */
@@ -53,8 +53,8 @@ public final class BufferedDocumentScanner implements ICharacterScanner {
 
 		fBufferOffset= offset;
 
-		if (fBufferOffset + fBuffer.length > fRangeOffset + fRangeLength)
-			fBufferLength= fRangeLength - (fBufferOffset - fRangeOffset);
+		if (fBufferOffset + fBuffer.length > fRangeLength)
+			fBufferLength= fRangeLength - fBufferOffset;
 		else
 			fBufferLength= fBuffer.length;