diff --git a/runtime/autoload/syntaxcomplete.vim b/runtime/autoload/syntaxcomplete.vim
index deaf7ed..4a13d4f 100644
--- a/runtime/autoload/syntaxcomplete.vim
+++ b/runtime/autoload/syntaxcomplete.vim
@@ -1,12 +1,18 @@
 " Vim completion script
 " Language:    All languages, uses existing syntax highlighting rules
 " Maintainer:  David Fishburn <fishburn@ianywhere.com>
-" Version:     1.1
-" Last Change: Wed Mar 01 2006 9:58:14 PM
+" Version:     1.2
+" Last Change: Sat Mar 18 2006 8:25:30 PM
 
 " Set completion with CTRL-X CTRL-O to autoloaded function.
+" This check is in place in case this script is
+" sourced directly instead of using the autoload feature. 
 if exists('+omnifunc')
-    setlocal omnifunc=syntaxcomplete#Complete
+    " Do not set the option if already set since this
+    " results in an E117 warning.
+    if &omnifunc == ""
+        setlocal omnifunc=syntaxcomplete#Complete
+    endif
 endif
 
 if exists('g:loaded_syntax_completion')
@@ -22,6 +28,7 @@
 
 let s:cache_name = []
 let s:cache_list = []
+let s:prepended  = ''
 
 " This function is used for the 'omnifunc' option.
 function! syntaxcomplete#Complete(findstart, base)
diff --git a/runtime/autoload/xmlcomplete.vim b/runtime/autoload/xmlcomplete.vim
index 6b7b804..2551cae 100644
--- a/runtime/autoload/xmlcomplete.vim
+++ b/runtime/autoload/xmlcomplete.vim
@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	XML
 " Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
-" Last Change:	2006 Feb 18
+" Last Change:	2006 Mar 19
 
 " This function will create Dictionary with users namespace strings and values
 " canonical (system) names of data files.  Names should be lowercase,
@@ -81,8 +81,9 @@
 				let context_lines = getline(curline-i, curline)
 				let b:compl_context = join(context_lines, ' ')
 				break
-			elseif context_line =~ '>[^<]*$'
+			elseif context_line =~ '>[^<]*$' || i == curline
 				" Normal tag line, no need for completion at all
+				" OR reached first line without tag at all
 				let b:compl_context = ''
 				break
 			endif