diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index 498acf90fb7..8ba930a44f0 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,6 @@
+2004-03-11 John Camelon
+	Updated content assist to not clear() the Scanner's definition map. 
+
 2004-03-09 Alain Magloire
 
 	Added the source folder refactor in the build
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java
index 85a6bb07277..543e35d3089 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java
@@ -78,7 +78,7 @@ public class CompletionEngine implements RelevanceConstants {
 	int completionStart = 0;
 	int completionLength = 0;
 	IPreferenceStore store = CUIPlugin.getDefault().getPreferenceStore();
-	private Map macroMap = new HashMap();
+	private Map macroMap = null;
 	
 	private static final String exceptionKeyword = "..."; //$NON-NLS-1$
 	// scope relevance element counters
@@ -175,7 +175,6 @@ public class CompletionEngine implements RelevanceConstants {
 	
 		IParser parser = null;
 		IScanner scanner = null;
-		macroMap.clear();
 		try
 		{
 			scanner = ParserFactory.createScanner( reader, realPath.toOSString(), scanInfo, ParserMode.COMPLETION_PARSE, language, requestor, ParserUtil.getScannerLogService() );